diff options
Diffstat (limited to 'qpid/java/distribution/src/main/assembly')
5 files changed, 305 insertions, 173 deletions
diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml index 04d83916e4..a9e769e312 100644 --- a/qpid/java/distribution/src/main/assembly/bin-test.xml +++ b/qpid/java/distribution/src/main/assembly/bin-test.xml @@ -27,32 +27,38 @@ </formats> <fileSets> - <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>../resources</directory> + <directory>src/main/release</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> <include>DISCLAIMER</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>README</include> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + <include>README.txt</include> </includes> - <fileMode>0444</fileMode> </fileSet> - - <!-- Include any release information --> <fileSet> - <directory>src/main/release</directory> + <directory>..</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> + <includes> + <include>*.txt</include> + </includes> </fileSet> - - <!-- Include any release information --> <fileSet> - <directory>../release-docs</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> + <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> @@ -60,40 +66,107 @@ <include>qpid-incubating.jar</include> </includes> </fileSet> - - <!-- Include etc --> - <fileSet> - <directory>../common/etc</directory> + </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> - <fileMode>0640</fileMode> - </fileSet> - <fileSet> - <directory>../broker/etc</directory> + <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> + </file> + <file> + <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <fileMode>0640</fileMode> - </fileSet> - - <!-- Include bin scripts--> - <fileSet> - <directory>../broker/bin</directory> + <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> + <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> + <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> + </file> + <file> + <source>../broker/etc/virtualhosts.xml</source> + <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> - <fileMode>0750</fileMode> - </fileSet> - <fileSet> - <directory>../common/bin</directory> + <destName>qpid.start</destName> + <fileMode>493</fileMode> + </file> + <file> + <source>../broker/bin/qpid.stop</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <fileMode>0750</fileMode> - </fileSet> - </fileSets> - + <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> + <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> + <destName>run.sh</destName> + <fileMode>493</fileMode> + </file> + <file> + <source>../broker/bin/runAll</source> + <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> + <destName>runAll</destName> + <fileMode>493</fileMode> + </file> + </files> <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/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml index 3620659e48..0461f0f643 100644 --- a/qpid/java/distribution/src/main/assembly/bin.xml +++ b/qpid/java/distribution/src/main/assembly/bin.xml @@ -27,38 +27,38 @@ </formats> <fileSets> - <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>../resources</directory> + <directory>src/main/release</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> <includes> <include>DISCLAIMER</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>README</include> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + <include>README.txt</include> </includes> - <fileMode>0444</fileMode> </fileSet> - - <!-- Include any release information --> <fileSet> - <directory>src/main/release</directory> + <directory>..</directory> <outputDirectory>qpid-${qpid.version}</outputDirectory> + <includes> + <include>*.txt</include> + </includes> </fileSet> - - <!-- Include any release information --> <fileSet> - <directory>..//release-docs</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> + <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>../release-docs</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> + <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,41 +66,131 @@ <include>qpid-incubating.jar</include> </includes> </fileSet> - - <!-- Include etc --> - <fileSet> - <directory>../common/etc</directory> + </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> - <fileMode>0640</fileMode> - </fileSet> - <fileSet> - <directory>../broker/etc</directory> + <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> + </file> + <file> + <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> - <fileMode>0640</fileMode> - </fileSet> - - <!-- Include bin scripts--> - <fileSet> - <directory>../broker/bin</directory> + <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> + <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> + <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> + </file> + <file> + <source>../broker/etc/virtualhosts.xml</source> + <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> - <fileMode>0750</fileMode> - </fileSet> - <fileSet> - <directory>../common/bin</directory> + <destName>qpid.start</destName> + <fileMode>493</fileMode> + </file> + <file> + <source>../broker/bin/qpid.stop</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> - <fileMode>0750</fileMode> - </fileSet> - - </fileSets> - + <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> + <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> + <destName>run.sh</destName> + <fileMode>493</fileMode> + </file> + <file> + <source>../broker/bin/runAll</source> + <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> + <destName>runAll</destName> + <fileMode>493</fileMode> + </file> + </files> <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/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml index 02ede019e5..1318248b2a 100644 --- a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml +++ b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml @@ -38,21 +38,13 @@ </moduleSets> --> <fileSets> - - - <!-- Include the currently hardwired Apache Legal bits --> <fileSet> - <directory>../resources</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> + <directory>src/main/release</directory> + <outputDirectory>qpidmc</outputDirectory> <includes> - <include>DISCLAIMER</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>README</include> + <include>DISCLAIMER</include> </includes> - <fileMode>0444</fileMode> </fileSet> - <fileSet> <directory>..</directory> <outputDirectory>qpidmc</outputDirectory> @@ -60,23 +52,20 @@ <include>*.txt</include> </includes> </fileSet> - - <fileSet> - <directory>src/main/release</directory> - <outputDirectory>qpidmc</outputDirectory> - </fileSet> - - <!-- Include any release information --> <fileSet> - <directory>../release-docs</directory> - <outputDirectory>qpidmc</outputDirectory> + <directory>src/main/release/docs</directory> + <outputDirectory>qpidmc/docs</outputDirectory> + <includes> + <include>RELEASE_NOTES.txt</include> + </includes> </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> @@ -84,7 +73,6 @@ <include>license.eclipse.txt</include> </includes> </fileSet> - <fileSet> <directory>../management/eclipse-plugin</directory> <outputDirectory>qpidmc</outputDirectory> @@ -92,14 +80,13 @@ <include>README.txt</include> </includes> </fileSet> - <fileSet> <directory>../management/eclipse-plugin/bin</directory> <outputDirectory>qpidmc/bin</outputDirectory> <includes> <include>qpidmc*.sh</include> </includes> - <fileMode>0777</fileMode> + <fileMode>777</fileMode> </fileSet> </fileSets> @@ -113,7 +100,7 @@ </includes> <scope>runtime</scope> </dependencySet> - + <dependencySet> <outputDirectory>qpidmc/eclipse/plugins</outputDirectory> <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping> diff --git a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml index 05df2c030b..826128b42f 100644 --- a/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml +++ b/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml @@ -24,34 +24,27 @@ <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>../resources</directory> + <directory>src/main/release</directory> <outputDirectory>qpidmc</outputDirectory> <includes> - <include>DISCLAIMER</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>README</include> + <include>DISCLAIMER</include> </includes> - <fileMode>0444</fileMode> - </fileSet> - - <fileSet> - <directory>src/main/release</directory> - <outputDirectory>qpidmc</outputDirectory> - </fileSet> - - <!-- Include any release information --> - <fileSet> - <directory>../release-docs</directory> - <outputDirectory>qpidmc</outputDirectory> </fileSet> - - <fileSet> <directory>..</directory> <outputDirectory>qpidmc</outputDirectory> @@ -59,20 +52,27 @@ <include>*.txt</include> </includes> </fileSet> - + <fileSet> + <directory>src/main/release/docs</directory> + <outputDirectory>qpidmc/docs</outputDirectory> + <includes> + <include>RELEASE_NOTES.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,20 +80,14 @@ <include>README.txt</include> </includes> </fileSet> - <fileSet> <directory>../management/eclipse-plugin/bin</directory> <outputDirectory>qpidmc/bin</outputDirectory> - <excludes> - <!-- Exclude the Unix scripts --> - <exclude>qpidmc*.sh</exclude> - </excludes> - <fileMode>0777</fileMode> + <includes> + <include>**</include> + </includes> + <fileMode>777</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> @@ -113,7 +107,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/qpid/java/distribution/src/main/assembly/src.xml b/qpid/java/distribution/src/main/assembly/src.xml index efdc4d98f4..8aa6183b4d 100644 --- a/qpid/java/distribution/src/main/assembly/src.xml +++ b/qpid/java/distribution/src/main/assembly/src.xml @@ -27,31 +27,24 @@ </formats> <fileSets> - <fileSet> - <directory>../resources</directory> - <outputDirectory>qpid-${qpid.version}-src</outputDirectory> - <includes> - <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> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE.txt</include> + <include>licenses/*.*</include> + <include>NOTICE.txt</include> + <include>README.txt</include> + <include>BUILDING.txt</include> + </includes> </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> @@ -78,29 +71,24 @@ <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>amqp.0-8.xml</include> - <include>cluster.0-8.xml</include> + <include>**/*</include> </includes> - </fileSet> - - <fileSet> - <directory>../../python</directory> - <outputDirectory>qpid-${qpid.version}-src/python</outputDirectory> </fileSet> </fileSets> </assembly> |