diff options
Diffstat (limited to 'java/distribution/src/main/assembly')
5 files changed, 173 insertions, 305 deletions
diff --git a/java/distribution/src/main/assembly/bin-test.xml b/java/distribution/src/main/assembly/bin-test.xml index a9e769e312..04d83916e4 100644 --- a/java/distribution/src/main/assembly/bin-test.xml +++ b/java/distribution/src/main/assembly/bin-test.xml @@ -27,38 +27,32 @@ </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> + + <!-- Include any release information --> <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpid-${qpid.version}/docs</outputDirectory> - <includes> - <include>RELEASE_NOTES.txt</include> - </includes> + <directory>../release-docs</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> </fileSet> + + <!-- Include the classpath jar qpid-incubating.jar --> <fileSet> <directory>target</directory> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> @@ -66,107 +60,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..3620659e48 100644 --- a/java/distribution/src/main/assembly/bin.xml +++ b/java/distribution/src/main/assembly/bin.xml @@ -27,38 +27,38 @@ </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> + + <!-- Include any release information --> <fileSet> - <directory>src/main/release/etc</directory> - <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <includes> - <include>logging.properties</include> - <include>log4j.properties</include> - </includes> + <directory>..//release-docs</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> </fileSet> + + <!-- Include any release information --> <fileSet> - <directory>src/main/release/docs</directory> - <outputDirectory>qpid-${qpid.version}/docs</outputDirectory> - <includes> - <include>RELEASE_NOTES.txt</include> - </includes> + <directory>../release-docs</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> </fileSet> + + <!-- Include the classpath jar qpid-incubating.jar --> <fileSet> <directory>target</directory> <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> @@ -66,131 +66,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..02ede019e5 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,21 @@ </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 +60,23 @@ <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> + + <!-- Include any release information --> + <fileSet> + <directory>../release-docs</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 +84,7 @@ <include>license.eclipse.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin</directory> <outputDirectory>qpidmc</outputDirectory> @@ -80,13 +92,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 +113,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..05df2c030b 100644 --- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml +++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml @@ -24,55 +24,55 @@ <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> + <directory>../resources</directory> <outputDirectory>qpidmc</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> + </fileSet> + + <!-- Include any release information --> + <fileSet> + <directory>../release-docs</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,14 +80,20 @@ <include>README.txt</include> </includes> </fileSet> + <fileSet> <directory>../management/eclipse-plugin/bin</directory> <outputDirectory>qpidmc/bin</outputDirectory> - <includes> - <include>**</include> - </includes> - <fileMode>777</fileMode> + <excludes> + <!-- Exclude the Unix scripts --> + <exclude>qpidmc*.sh</exclude> + </excludes> + <fileMode>0777</fileMode> </fileSet> + + <!-- Required to make eclipse load the JMXRemote SASL pluging --> + <!-- This should be removed as JMXRemote SASL module is not ASF license friendly --> + <!-- However management console doesn't seem to work without it --> <fileSet> <directory>../management/eclipse-plugin/src/main/resources/sasl</directory> <outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory> @@ -107,7 +113,7 @@ <exclude>org.apache.qpid:qpid-common</exclude> <exclude>org.apache.qpid:qpid-broker</exclude> <exclude>org.apache.qpid:qpid-client</exclude> - <exclude>commons-cli:commons-cli</exclude> + <exclude>commons-cli:commons-cli</exclude> <exclude>commons-configuration:commons-configuration</exclude> <exclude>commons-lang:commons-lang</exclude> <exclude>org.apache.mina:mina-filter-ssl</exclude> diff --git a/java/distribution/src/main/assembly/src.xml b/java/distribution/src/main/assembly/src.xml index 8aa6183b4d..efdc4d98f4 100644 --- a/java/distribution/src/main/assembly/src.xml +++ b/java/distribution/src/main/assembly/src.xml @@ -27,24 +27,31 @@ </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> + + <!-- Include any release information --> + <fileSet> + <directory>../release-docs</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 +78,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> |