Merged revisions 539476-539480,539482-539483,539485-539500,539502-539593,539595-539782,539784-539787,539789-540106,540108-540168,540170-540510,540512-541246,541248-541919,541921-542483,542485-542788,542790-543495,543497-544108,544110-544421,544423-544507,544509-546095,546097-546189,546191-546440,546442-546457,546459-547177,547179-547626,547628-548381 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r539476 | ritchiem | 2007-05-18 15:12:28 +0100 (Fri, 18 May 2007) | 1 line
  
  QPID-401 Update to pom to correctly set the broker.dir
........
  r544866 | rupertlssmith | 2007-06-06 16:25:02 +0100 (Wed, 06 Jun 2007) | 1 line
  
  Updated examples to build source jar. Also put the java14 retrotranslated module back in now that the strange repeating build problem is solved.
........
  r545146 | ritchiem | 2007-06-07 12:30:01 +0100 (Thu, 07 Jun 2007) | 1 line
  
  POM update renumbering tests now we have trimmed down the tests being run.
........
  r548276 | ritchiem | 2007-06-18 10:59:32 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Various License header updates.
........
  r548279 | ritchiem | 2007-06-18 11:17:20 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Various License header updates.
........
  r548302 | ritchiem | 2007-06-18 11:49:50 +0100 (Mon, 18 Jun 2007) | 2 lines
  
  Various License header updates.
  Update to PrincipalDatabase's to ensure they work correctly with # comments.
........
  r548308 | ritchiem | 2007-06-18 11:58:38 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Various License header updates, missed this file. Though the first update of it via the JMX console will remove the license.
........
  r548312 | rupertlssmith | 2007-06-18 12:03:09 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Added SLF4J to Log4J binding.
........
  r548315 | ritchiem | 2007-06-18 12:07:45 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Old lib dir from M1
........
  r548317 | ritchiem | 2007-06-18 12:13:57 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Old lib dirs from M1
........
  r548319 | ritchiem | 2007-06-18 12:16:25 +0100 (Mon, 18 Jun 2007) | 1 line
  
  Mistakenly checked in Intelij file
........
  r548381 | ritchiem | 2007-06-18 16:37:41 +0100 (Mon, 18 Jun 2007) | 1 line
  
  QPID-525 Memory leak in DestWildExchange. Used routing key in remove rather than empty queue
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@548400 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 106 insertions, 2 deletions

diff --git a/java/client/example/pom.xml b/java/client/example/pom.xml
index dd5b7a9c65..50680666e1 100644
--- a/java/client/example/pom.xml
+++ b/java/client/example/pom.xml
@@ -15,7 +15,7 @@
     KIND, either express or implied. See the License for the
     specific language governing permissions and limitations
     under the License.
-  -->
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -95,6 +95,57 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+
+            <!-- Build a zip file with the source in it, this had to be done with the assembly plugin as the source plugin did not provide a way
+                 to exclude the .svn directories. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>source-jar.xml</descriptor>
+                    </descriptors>
+                    <outputDirectory>target</outputDirectory>
+                    <workDirectory>target/assembly/work</workDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Publish the source as a build artifact. -->
+            <!--
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>target/${project.build.finalName}-source.jar</file>
+                                    <type>jar</type>
+                                    <classifier>source</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+
         </plugins>
     </build>
 </project>
diff --git a/java/client/example/source-jar.xml b/java/client/example/source-jar.xml
new file mode 100644
index 0000000000..60451448b8
--- /dev/null
+++ b/java/client/example/source-jar.xml
@@ -0,0 +1,35 @@
+<!--

+    Licensed to the Apache Software Foundation (ASF) under one

+    or more contributor license agreements. See the NOTICE file

+    distributed with this work for additional information

+    regarding copyright ownership. The ASF licenses this file

+    to you under the Apache License, Version 2.0 (the

+    "License"); you may not use this file except in compliance

+    with the License. You may obtain a copy of the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing,

+    software distributed under the License is distributed on an

+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+    KIND, either express or implied. See the License for the

+    specific language governing permissions and limitations

+    under the License.

+-->

+<!-- This is an assembly descriptor that produces a jar file that contains all the

+     dependencies, fully expanded into a single jar, required to run the tests of

+     a maven project. 

+ -->

+<assembly>

+  <id>source</id>

+  <formats>

+    <format>jar</format>

+  </formats>

+  <includeBaseDirectory>false</includeBaseDirectory>

+  <fileSets>

+    <fileSet>

+      <directory>src/main/java</directory>

+      <outputDirectory></outputDirectory>

+    </fileSet>

+  </fileSets>

+</assembly>

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties b/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
index 7f513341a2..a60e3964ad 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
+++ b/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory
 
 # use the following property to configure the default connector
@@ -5,7 +23,7 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF
 
 # register some connection factories
 # connectionfactory.[jndiname] = [ConnectionURL]
-connectionfactory.local = amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'
+connectionfactory.local = amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672'
 
 # register some queues in JNDI using the form
 # queue.[jndiName] = [physicalName]