diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-07-18 14:36:11 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-07-18 14:36:11 +0000 |
| commit | 0827d643ce33d021d621aade4757008252e9009c (patch) | |
| tree | 580854d120b3081d7ece404a4900b16d5a0f34eb | |
| parent | 12893c188fb12fb9295214ffbc2c4de9f48de965 (diff) | |
| download | qpid-python-0827d643ce33d021d621aade4757008252e9009c.tar.gz | |
Updates to pom files and Licensing/Notice files for M2 release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557276 13f79535-47bb-0310-9956-ffa450edef68
20 files changed, 449 insertions, 534 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml index 575f388198..b1dbded542 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -94,6 +94,25 @@ <build> <plugins> + + + <!--plugin> + <artifactId>minijar-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>minijars</goal> + </goals> + <configuration> + <stripUnusedClasses>true</stripUnusedClasses> + </configuration> + </execution> + </executions> + </plugin--> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> diff --git a/java/client/pom.xml b/java/client/pom.xml index c36c54a10f..02958ded6f 100644 --- a/java/client/pom.xml +++ b/java/client/pom.xml @@ -123,6 +123,24 @@ <build> <plugins> + + <plugin> + <artifactId>minijar-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>ueberjar</goal> + </goals> + <configuration> + <stripUnusedClasses>true</stripUnusedClasses> + <name>[artifactId]-[version]-single.jar</name> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> diff --git a/java/common/pom.xml b/java/common/pom.xml index a16573e066..0874a5416b 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -93,22 +93,34 @@ </executions> </plugin> - + </plugins> </build> <dependencies> - <dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + + + + <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-api</artifactId> <version>1.4.0</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.0</version> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.0</version> <scope>test</scope> </dependency> diff --git a/java/distribution/src/main/assembly/bin-test.xml b/java/distribution/src/main/assembly/bin-test.xml index a9e769e312..30d9de11d7 100644 --- a/java/distribution/src/main/assembly/bin-test.xml +++ b/java/distribution/src/main/assembly/bin-test.xml @@ -27,38 +27,26 @@ </formats> <fileSets> + <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>src/main/release</directory> + <directory>../resources</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> <include>DISCLAIMER</include> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - <include>README.txt</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> </includes> + <fileMode>0444</fileMode> </fileSet> + + <!-- Include any release information --> <fileSet> - <directory>..</directory> + <directory>src/main/release</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> - <includes> - <include>*.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/etc</directory> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <includes> - <include>logging.properties</include> - <include>log4j.properties</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpid-${qpid.version}/docs</outputDirectory> - <includes> - <include>RELEASE_NOTES.txt</include> - </includes> </fileSet> + + <!-- Include the classpath jar qpid-incubating.jar --> <fileSet> <directory>target</directory> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> @@ -66,107 +54,40 @@ <include>qpid-incubating.jar</include> </includes> </fileSet> - </fileSets> - <files> - <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have - to use decimal numbers to specify fileMode --> - <file> - <source>../common/etc/qpid-run.conf</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>qpid-run.conf</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/config.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>config.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/log4j.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>log4j.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/passwd</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>passwd</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/qpid-server.conf</source> + + <!-- Include etc --> + <fileSet> + <directory>../common/etc</directory> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>qpid-server.conf</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/virtualhosts.xml</source> + <fileMode>0640</fileMode> + </fileSet> + <fileSet> + <directory>../broker/etc</directory> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>virtualhosts.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/bin/qpid.start</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.start</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid.stop</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.stop</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid.stopall</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.stopall</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../common/bin/qpid-run</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-run</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid-server</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-server</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid-server.bat</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-server.bat</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/run.bat</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>run.bat</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/run.sh</source> + <fileMode>0640</fileMode> + </fileSet> + + <!-- Include bin scripts--> + <fileSet> + <directory>../broker/bin</directory> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>run.sh</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/runAll</source> + <fileMode>0750</fileMode> + </fileSet> + <fileSet> + <directory>../common/bin</directory> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>runAll</destName> - <fileMode>493</fileMode> - </file> - </files> + <fileMode>0750</fileMode> + </fileSet> + </fileSets> + <dependencySets> <dependencySet> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> <unpack>false</unpack> <excludes> + <!-- Exclude the jar output of this build process --> <exclude>org.apache.qpid:qpid-distribution</exclude> + <!-- Exclude the Console dependancies --> <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude> <exclude>org.eclipse.core:org.eclipse.core.commands</exclude> <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude> diff --git a/java/distribution/src/main/assembly/bin.xml b/java/distribution/src/main/assembly/bin.xml index 0461f0f643..99701c0a08 100644 --- a/java/distribution/src/main/assembly/bin.xml +++ b/java/distribution/src/main/assembly/bin.xml @@ -27,38 +27,26 @@ </formats> <fileSets> + <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>src/main/release</directory> + <directory>../resources</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> <include>DISCLAIMER</include> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - <include>README.txt</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> </includes> + <fileMode>0444</fileMode> </fileSet> + + <!-- Include any release information --> <fileSet> - <directory>..</directory> + <directory>src/main/release</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> - <includes> - <include>*.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/etc</directory> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <includes> - <include>logging.properties</include> - <include>log4j.properties</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpid-${qpid.version}/docs</outputDirectory> - <includes> - <include>RELEASE_NOTES.txt</include> - </includes> </fileSet> + + <!-- Include the classpath jar qpid-incubating.jar --> <fileSet> <directory>target</directory> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> @@ -66,131 +54,41 @@ <include>qpid-incubating.jar</include> </includes> </fileSet> - </fileSets> - <files> - <!-- due to a bug in the assembly 2.1 plugin (MASSEMBLY-153) you have - to use octal numbers to specify fileMode note not valid in 2.2 assembly plugin --> - <file> - <source>../common/etc/qpid-run.conf</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>qpid-run.conf</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/config.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>config.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/jmxremote.access</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>jmxremote.access</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/transient_config.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>transient_config.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/persistent_config.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>persistent_config.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/log4j.xml</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>log4j.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/passwd</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>passwd</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/passwdVhost</source> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>passwdVhost</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/qpid-server.conf</source> + + <!-- Include etc --> + <fileSet> + <directory>../common/etc</directory> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>qpid-server.conf</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/etc/virtualhosts.xml</source> + <fileMode>0640</fileMode> + </fileSet> + <fileSet> + <directory>../broker/etc</directory> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <destName>virtualhosts.xml</destName> - <fileMode>420</fileMode> - </file> - <file> - <source>../broker/bin/qpid.start</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.start</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid.stop</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.stop</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid.stopall</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid.stopall</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../common/bin/qpid-run</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-run</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid-server</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-server</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/qpid-server.bat</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>qpid-server.bat</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/run.bat</source> - <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>run.bat</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/run.sh</source> + <fileMode>0640</fileMode> + </fileSet> + + <!-- Include bin scripts--> + <fileSet> + <directory>../broker/bin</directory> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>run.sh</destName> - <fileMode>493</fileMode> - </file> - <file> - <source>../broker/bin/runAll</source> + <fileMode>0750</fileMode> + </fileSet> + <fileSet> + <directory>../common/bin</directory> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <destName>runAll</destName> - <fileMode>493</fileMode> - </file> - </files> + <fileMode>0750</fileMode> + </fileSet> + + </fileSets> + <dependencySets> <dependencySet> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> <unpack>false</unpack> <excludes> + <!-- Exclude the jar output of this build process --> <exclude>org.apache.qpid:qpid-distribution</exclude> + <!-- Exclude the Console dependancies --> <exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude> <exclude>org.eclipse.core:org.eclipse.core.commands</exclude> <exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude> diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml index 1318248b2a..d5470ef161 100644 --- a/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml +++ b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml @@ -38,13 +38,22 @@ </moduleSets> --> <fileSets> + + + <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>src/main/release</directory> - <outputDirectory>qpidmc</outputDirectory> + <directory>../resources</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> - <include>DISCLAIMER</include> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> </includes> + <fileMode>0444</fileMode> </fileSet> + + <fileSet> <directory>..</directory> <outputDirectory>qpidmc</outputDirectory> @@ -52,20 +61,17 @@ <include>*.txt</include> </includes> </fileSet> + <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpidmc/docs</outputDirectory> - <includes> - <include>RELEASE_NOTES.txt</include> - </includes> + <directory>src/main/release</directory> + <outputDirectory>qpidmc</outputDirectory> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory> <outputDirectory>qpidmc/configuration</outputDirectory> - <includes> - <include>**</include> - </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/src/main/resources</directory> <outputDirectory>qpidmc</outputDirectory> @@ -73,6 +79,7 @@ <include>license.eclipse.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin</directory> <outputDirectory>qpidmc</outputDirectory> @@ -80,13 +87,14 @@ <include>README.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/bin</directory> <outputDirectory>qpidmc/bin</outputDirectory> <includes> <include>qpidmc*.sh</include> </includes> - <fileMode>777</fileMode> + <fileMode>0777</fileMode> </fileSet> </fileSets> @@ -100,7 +108,7 @@ </includes> <scope>runtime</scope> </dependencySet> - + <dependencySet> <outputDirectory>qpidmc/eclipse/plugins</outputDirectory> <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping> diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/java/distribution/src/main/assembly/management-eclipse-plugin.xml index 826128b42f..b260e6b0f2 100644 --- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml +++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml @@ -24,55 +24,48 @@ <formats> <format>zip</format> </formats> -<!-- - <moduleSets> - <moduleSet> - <includes> - <include>org.apache.qpid.management:org.apache.qpid.management.ui</include> - </includes> - <binaries> - <includeDependencies>true</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - --> + <fileSets> + + <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>src/main/release</directory> - <outputDirectory>qpidmc</outputDirectory> + <directory>../resources</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> - <include>DISCLAIMER</include> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> </includes> + <fileMode>0444</fileMode> </fileSet> + <fileSet> - <directory>..</directory> + <directory>src/main/release</directory> <outputDirectory>qpidmc</outputDirectory> - <includes> - <include>*.txt</include> - </includes> </fileSet> + <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpidmc/docs</outputDirectory> + <directory>..</directory> + <outputDirectory>qpidmc</outputDirectory> <includes> - <include>RELEASE_NOTES.txt</include> + <include>*.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/src/main/resources/win32/configuration</directory> <outputDirectory>qpidmc/configuration</outputDirectory> - <includes> - <include>**</include> - </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/src/main/resources</directory> <outputDirectory>qpidmc/eclipse</outputDirectory> <includes> <include>*.*</include> - </includes> + </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin</directory> <outputDirectory>qpidmc</outputDirectory> @@ -80,22 +73,17 @@ <include>README.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/bin</directory> <outputDirectory>qpidmc/bin</outputDirectory> - <includes> - <include>**</include> - </includes> - <fileMode>777</fileMode> - </fileSet> - <fileSet> - <directory>../management/eclipse-plugin/src/main/resources/sasl</directory> - <outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory> - <includes> - <include>MANIFEST.MF</include> - </includes> + <excludes> + <!-- Exclude the Unix scripts --> + <exclude>qpidmc*.sh</exclude> + </excludes> + <fileMode>0777</fileMode> </fileSet> - </fileSets> + </fileSets> <dependencySets> <dependencySet> diff --git a/java/distribution/src/main/assembly/src.xml b/java/distribution/src/main/assembly/src.xml index 8aa6183b4d..2ee80023ef 100644 --- a/java/distribution/src/main/assembly/src.xml +++ b/java/distribution/src/main/assembly/src.xml @@ -27,24 +27,25 @@ </formats> <fileSets> - <fileSet> - <directory>src/main/release</directory> + <fileSet> + <directory>../resources</directory> <outputDirectory>qpid-${qpid.version}-src</outputDirectory> <includes> - <include>DISCLAIMER</include> - <include>LICENSE.txt</include> - <include>licenses/*.*</include> - <include>NOTICE.txt</include> - <include>README.txt</include> - <include>BUILDING.txt</include> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + <include>README</include> </includes> </fileSet> + + <fileSet> + <directory>src/main/release</directory> + <outputDirectory>qpid-${qpid.version}-src</outputDirectory> + </fileSet> + <fileSet> <directory>..</directory> <outputDirectory>qpid-${qpid.version}-src/java</outputDirectory> - <includes> - <include>**/*</include> - </includes> <excludes> <exclude>build.xml</exclude> <exclude>distribution/build.xml</exclude> @@ -71,24 +72,29 @@ <exclude>**/eclipse-plugin/src/main/resources/**</exclude> </excludes> </fileSet> + <fileSet> <directory>../../gentools</directory> <outputDirectory>qpid-${qpid.version}-src/gentools</outputDirectory> - <includes> - <include>**/*</include> - </includes> <excludes> <exclude>**/build</exclude> <exclude>**/build/**/*</exclude> <exclude>**/*.class</exclude> </excludes> </fileSet> + <fileSet> <directory>../../specs</directory> <outputDirectory>qpid-${qpid.version}-src/specs</outputDirectory> <includes> - <include>**/*</include> + <include>amqp.0-8.xml</include> + <include>cluster.0-8.xml</include> </includes> + </fileSet> + + <fileSet> + <directory>../../python</directory> + <outputDirectory>qpid-${qpid.version}-src/python</outputDirectory> </fileSet> </fileSets> </assembly> diff --git a/java/distribution/src/main/release/DISCLAIMER b/java/distribution/src/main/release/DISCLAIMER deleted file mode 100644 index c321113c9e..0000000000 --- a/java/distribution/src/main/release/DISCLAIMER +++ /dev/null @@ -1,5 +0,0 @@ -Apache Qpid is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/java/distribution/src/main/release/NOTICE.txt b/java/distribution/src/main/release/NOTICE.txt deleted file mode 100644 index 82d3dbc632..0000000000 --- a/java/distribution/src/main/release/NOTICE.txt +++ /dev/null @@ -1,36 +0,0 @@ -========================================================================= -== NOTICE file corresponding to the section 4 d of == -== the Apache License, Version 2.0, == -== in this case for the Apache Qpid distribution. == -========================================================================= - -This product includes software developed by the Apache Software Foundation -(http://www.apache.org/). - -Please read the LICENSE.txt file present in the root directory of this -distribution. - - -Aside from contributions to the Apache Qpid project, this software also -includes (binary only): - - - The SAXON XSLT Processor from Michael Kay distributed under the - Mozilla Public License v1.0, which is available for download at - http://saxon.sourceforge.net/ - - - The JUnit regression testing framework written by Erich Gamma - and Kent Beck and distributed under the Common Public License v1.0. - JUnit is available for download at - http://sourceforge.net/projects/junit/ - - - The Simple Logging Facade For Java (slf4j), Copyright (c) - 2004-2005 SLF4J.ORG, Copyright (c) 2004-2005 QOS.ch. slf4j is - licensed under identical terms to the MIT/X11 license and - available for download at http://www.slf4j.org/ - - - Software from the Eclipse project. The binaries from this project are - distributed under the Eclipse Public License and can be donwloaded - from http://www.eclipse.org/ - - - diff --git a/java/distribution/src/main/release/README.txt b/java/distribution/src/main/release/README.txt deleted file mode 100644 index 14706170bc..0000000000 --- a/java/distribution/src/main/release/README.txt +++ /dev/null @@ -1,104 +0,0 @@ - -Documentation --------------- -All of our user documentation for the Qpid Java components can be accessed on our wiki at: - -http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation - -This includes a Getting Started Guide and FAQ as well as detailed developer documentation. -However, here's a VERY quick guide to running the installed Qpid broker, once you have installed it somewhere ! - - -Running the Broker ------------------- - -To run the broker, set the QPID_HOME environment variable to -distribution directory and add $QPID_HOME/bin to your PATH. Then run -the qpid-server shell script or qpid-server.bat batch file to start -the broker. By default, the broker will use $QPID_HOME/etc to find -the configuration files. You can supply a custom configuration using -the -c argument. - -For example: - -qpid-server -c ~/etc/config.xml - -You can get a list of all command line arguments by using the -h argument. - - -Developing ----------- - -In order to build Qpid you need Ant 1.6.5. Use ant -p to list the -available targets. The default ant target, build, creates a working -development-mode distribution in the build directory. To run the -scripts in build/bin set QPID_HOME to the build directory and put -${QPID_HOME}/bin on your PATH. The scripts in that directory include -the standard ones in the distribution and a number of testing scripts. - - -Running Tests -------------- - -The simplest test to ensure everything is working is the "service -request reply" test. This involves one client that is known as a -"service provider" and it listens on a well-known queue for -requests. Another client, known as the "service requester" creates a -private (temporary) response queue, creates a message with the private -response queue set as the "reply to" field and then publishes the -message to the well known service queue. The test allows you to time -how long it takes to send messages and receive the response back. It -also allows varying of the message size. - -You must start the service provider first: - -serviceProvidingClient.sh nop host:port - -where host:port is the host and port you are running the broker -on. - -To run the service requester: - -serviceRequestingClient.sh nop host:post <count> <bytes> - -This requests <count> messages, each of size <bytes>. After -receiving all the messages the client outputs the rate it achieved. - -A more realistic test is the "headers test", which tests the -performance of routing messages based on message headers to a -configurable number of clients (e.g. 50). A publisher sends 10000 -messages to each client and waits to receive a message from each -client when it has received all the messages. - -You run the listener processes first: - -run_many.sh 10 header "headersListener.sh -host 10.0.0.1 -port 5672" - -In this command, the first argument means start 10 processes, the -second is just a name use in the log files generated and the third -argument is the command to run. In this case it runs another shell -script but it could be anything. - -Then run the publisher process: - -headersPublisher.sh -host 10.0.0.1 -port 5672 10000 10 - -The last two arguments are: the number of messages to send to each -client, and the number of clients. - -Note that before starting the publisher you should wait about 30 -seconds to ensure all the clients are registered with the broker (you -can see this from the broker output). Otherwise the numbers will be -slightly skewed. - -A third useful test, which can easily be ported to other JMS -implementations is the "topic test". It does the same as the headers -test but using a standard topic (e.g. pub sub). - -To run the listeners: - -run_many.sh 10 topic "topicListener.sh -host 10.0.0.1 -port 5672" - -and to run the publisher: - -topicPublisher.sh -host 10.0.0.1 -port 5672 -clients 10 -messages 10000 diff --git a/java/pom.xml b/java/pom.xml index 114abfab1b..547b5d12ec 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -155,14 +155,26 @@ under the License. <module>perftests</module> <module>integrationtests</module> <module>management/eclipse-plugin</module> - <module>client/example</module> - <module>client-java14</module> + <module>client/example</module> + <module>client-java14</module> </modules> <build> <resources> + + <resource> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <directory>../resources</directory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </resource> + <resource> <directory>src/main/java</directory> <excludes> @@ -172,26 +184,28 @@ under the License. </resource> <resource> <directory>src/main/resources</directory> - <includes> - <include>**</include> - </includes> </resource> <resource> <directory>src/main/resources-filtered</directory> - <includes> - <include>**</include> - </includes> <filtering>true</filtering> </resource> <resource> <directory>target/generated/src/main/resources</directory> - <includes> - <include>**</include> - </includes> </resource> </resources> <testResources> + <testResource> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <directory>../resources</directory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </testResource> + <testResource> <directory>src/test/java</directory> <excludes> @@ -200,9 +214,6 @@ under the License. </testResource> <testResource> <directory>src/test/resources</directory> - <includes> - <include>**</include> - </includes> </testResource> <testResource> <directory>src/test/java</directory> @@ -398,8 +409,12 @@ under the License. </pluginManagement> - <!--plugins> - <plugin> + <plugins> + + <!-- Disabled as plugin crashes on the systest module. + Also, the resulting NOTICE file doesn't include all license info due to missing data in dependant poms. + + <plugin> <artifactId>maven-remote-resources-plugin</artifactId> <version>1.0-alpha-5</version> <executions> @@ -419,8 +434,8 @@ under the License. </configuration> </execution> </executions> - </plugin> - </plugins--> + </plugin--> + </plugins> <defaultGoal>install</defaultGoal> @@ -591,7 +606,6 @@ under the License. --> <!-- Run the javadoc report. --> - <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -605,7 +619,6 @@ under the License. </tags> </configuration> </plugin> - --> <!-- Generate the clover coverage report. --> <!-- diff --git a/java/distribution/src/main/release/LICENSE.txt b/java/resources/LICENSE index 6b0b1270ff..6b0b1270ff 100755..100644 --- a/java/distribution/src/main/release/LICENSE.txt +++ b/java/resources/LICENSE diff --git a/java/resources/META-INF/DISCLAIMER b/java/resources/META-INF/DISCLAIMER new file mode 100644 index 0000000000..1ca63e46e2 --- /dev/null +++ b/java/resources/META-INF/DISCLAIMER @@ -0,0 +1,10 @@ +Apache Qpid is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. diff --git a/java/resources/META-INF/DISCLAIMER.txt b/java/resources/META-INF/DISCLAIMER.txt deleted file mode 100644 index d33c54a807..0000000000 --- a/java/resources/META-INF/DISCLAIMER.txt +++ /dev/null @@ -1,7 +0,0 @@ -Qpid is an effort undergoing incubation at the Apache Software Foundation -(ASF). Incubation is required of all newly accepted projects until a further -review indicates that the infrastructure, communications, and decision making -process have stabilized in a manner consistent with other successful ASF -projects. While incubation status is not necessarily a reflection of the -completeness or stability of the code, it does indicate that the project -has yet to be fully endorsed by the ASF.
\ No newline at end of file diff --git a/java/resources/LICENSE.txt b/java/resources/META-INF/LICENSE index 6b0b1270ff..6b0b1270ff 100755..100644 --- a/java/resources/LICENSE.txt +++ b/java/resources/META-INF/LICENSE diff --git a/java/resources/META-INF/NOTICE b/java/resources/META-INF/NOTICE new file mode 100644 index 0000000000..f62ec14896 --- /dev/null +++ b/java/resources/META-INF/NOTICE @@ -0,0 +1,105 @@ +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Qpid Common Utilities +// ------------------------------------------------------------------ + +Apache Qpid +Copyright 2006-2007 Apache Software Foundation + +This product includes software developed at +Apache Software Foundation (http://www.apache.org/) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - relaxngDatatype:relaxngDatatype:jar:20020414 (http://sourceforge.net/projects/relaxng) +License: BSD License (http://www.opensource.org/licenses/bsd-license.php) + +This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - isorelax:isorelax:jar:20020414 +License: MIT license (http://www.opensource.org/licenses/mit-license.html) + +This product includes/uses software, SLF4J API Module (http://www.slf4j.org), +developed by QOS.ch (http://www.qos.ch) +License: MIT License (http://www.slf4j.org/license.html) + +This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1, +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Digester - commons-digester:commons-digester:jar:1.6 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0 +Ideveloped by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - msv:msv:jar:20020414 +developed by (https://msv.dev.java.net/) +License: + +This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/), +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/), +developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/) +License: Public Domain (http://creativecommons.org/licenses/publicdomain) + +This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl) +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - xerces:xercesImpl:jar:2.2.1 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, - javax.servlet:servlet-api:jar:2.3 + +This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/), +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Apache MINA Java5 Extensions (http://directory.apache.org/subprojects/mina/mina-java5) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Jaxen - jaxen:jaxen:jar:1.0-FCS +License: Apache License (http://jaxen.org/faq.html) + +This product includes/uses software, BeanUtils (http://jakarta.apache.org/commons/beanutils/) +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, XML Commons External Components XML APIs (http://xml.apache.org/commons/#external), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Commons Beanutils Core - commons-beanutils:commons-beanutils-core:jar:1.7.0 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Dom4j - dom4j:dom4j:jar:1.4 +developed by MetaStuff, Ltd. (http://www.dom4j.org/) +License: BSD License (http://www.dom4j.org/license.html) + +This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS +developed by Michael Kay (http://saxon.sourceforge.net/) +License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php) + diff --git a/java/resources/NOTICE b/java/resources/NOTICE new file mode 100644 index 0000000000..f62ec14896 --- /dev/null +++ b/java/resources/NOTICE @@ -0,0 +1,105 @@ +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Qpid Common Utilities +// ------------------------------------------------------------------ + +Apache Qpid +Copyright 2006-2007 Apache Software Foundation + +This product includes software developed at +Apache Software Foundation (http://www.apache.org/) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - relaxngDatatype:relaxngDatatype:jar:20020414 (http://sourceforge.net/projects/relaxng) +License: BSD License (http://www.opensource.org/licenses/bsd-license.php) + +This product includes/uses software, Apache MINA Core API (http://directory.apache.org/projects/mina/) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - isorelax:isorelax:jar:20020414 +License: MIT license (http://www.opensource.org/licenses/mit-license.html) + +This product includes/uses software, SLF4J API Module (http://www.slf4j.org), +developed by QOS.ch (http://www.qos.ch) +License: MIT License (http://www.slf4j.org/license.html) + +This product includes/uses software, Commons Collections - commons-collections:commons-collections:jar:3.1, +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Digester - commons-digester:commons-digester:jar:1.6 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons CLI - commons-cli:commons-cli:jar:1.0 +Ideveloped by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - msv:msv:jar:20020414 +developed by (https://msv.dev.java.net/) +License: + +This product includes/uses software, Codec (http://jakarta.apache.org/commons/codec/), +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Logging - commons-logging:commons-logging:jar:1.0 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Backport of JSR 166 (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/), +developed by Dawid Kurzyniec (http://www.mathcs.emory.edu/~dawidk/) +License: Public Domain (http://creativecommons.org/licenses/publicdomain) + +This product includes/uses software, Commons Lang - commons-lang:commons-lang:jar:2.1 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Apache MINA SSL Filter (http://directory.apache.org/subprojects/mina/mina-filter-ssl) +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Unnamed - xerces:xercesImpl:jar:2.2.1 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, - javax.servlet:servlet-api:jar:2.3 + +This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0 +developed by Apache Software Foundation (http://www.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Configuration (http://jakarta.apache.org/commons/), +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Apache MINA Java5 Extensions (http://directory.apache.org/subprojects/mina/mina-java5) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Jaxen - jaxen:jaxen:jar:1.0-FCS +License: Apache License (http://jaxen.org/faq.html) + +This product includes/uses software, BeanUtils (http://jakarta.apache.org/commons/beanutils/) +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, XML Commons External Components XML APIs (http://xml.apache.org/commons/#external), +developed by Apache Software Foundation (http://www.apache.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software, Commons Beanutils Core - commons-beanutils:commons-beanutils-core:jar:1.7.0 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Commons Logging API - commons-logging:commons-logging-api:jar:1.0.4 +developed by The Apache Software Foundation (http://jakarta.apache.org) +License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software, Dom4j - dom4j:dom4j:jar:1.4 +developed by MetaStuff, Ltd. (http://www.dom4j.org/) +License: BSD License (http://www.dom4j.org/license.html) + +This product includes/uses software, Saxon - saxpath:saxpath:jar:1.0-FCS +developed by Michael Kay (http://saxon.sourceforge.net/) +License: Mozilla Public License v1.0, (http://www.opensource.org/licenses/mozilla1.0.php) + diff --git a/java/resources/NOTICE.txt b/java/resources/NOTICE.txt deleted file mode 100644 index 82d3dbc632..0000000000 --- a/java/resources/NOTICE.txt +++ /dev/null @@ -1,36 +0,0 @@ -========================================================================= -== NOTICE file corresponding to the section 4 d of == -== the Apache License, Version 2.0, == -== in this case for the Apache Qpid distribution. == -========================================================================= - -This product includes software developed by the Apache Software Foundation -(http://www.apache.org/). - -Please read the LICENSE.txt file present in the root directory of this -distribution. - - -Aside from contributions to the Apache Qpid project, this software also -includes (binary only): - - - The SAXON XSLT Processor from Michael Kay distributed under the - Mozilla Public License v1.0, which is available for download at - http://saxon.sourceforge.net/ - - - The JUnit regression testing framework written by Erich Gamma - and Kent Beck and distributed under the Common Public License v1.0. - JUnit is available for download at - http://sourceforge.net/projects/junit/ - - - The Simple Logging Facade For Java (slf4j), Copyright (c) - 2004-2005 SLF4J.ORG, Copyright (c) 2004-2005 QOS.ch. slf4j is - licensed under identical terms to the MIT/X11 license and - available for download at http://www.slf4j.org/ - - - Software from the Eclipse project. The binaries from this project are - distributed under the Eclipse Public License and can be donwloaded - from http://www.eclipse.org/ - - - diff --git a/java/resources/README.txt b/java/resources/README index 1d52d487fb..1d52d487fb 100644 --- a/java/resources/README.txt +++ b/java/resources/README |