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@548400 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 20 insertions, 2 deletions

diff --git a/qpid/java/client-java14/pom.xml b/qpid/java/client-java14/pom.xml
index 17d76ea685..90a49e7d6c 100644
--- a/qpid/java/client-java14/pom.xml
+++ b/qpid/java/client-java14/pom.xml
@@ -149,7 +149,7 @@
                         <id>assembly-dist</id>

                         <phase>package</phase>

                         <goals>

-                            <goal>assembly</goal>

+                            <goal>attached</goal>

                         </goals>

                         <configuration>

                             <descriptors>

@@ -167,7 +167,7 @@
                         <id>assembly-alltestdeps</id>

                         <phase>package</phase>

                         <goals>

-                            <goal>assembly</goal>

+                            <goal>attached</goal>

                         </goals>

                         <configuration>

                             <descriptors>

diff --git a/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml b/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml
index dd279ffb3a..091fd46427 100644
--- a/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml
+++ b/qpid/java/client-java14/src/main/assembly/jar-with-dependencies.xml
@@ -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.

+-->

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

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

      of a maven project.