diff options
Diffstat (limited to 'java/distribution/src/main')
| -rw-r--r-- | java/distribution/src/main/assembly/bin-test.xml | 175 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/bin.xml | 8 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/client-bin.xml | 111 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/tests.xml | 57 |
4 files changed, 175 insertions, 176 deletions
diff --git a/java/distribution/src/main/assembly/bin-test.xml b/java/distribution/src/main/assembly/bin-test.xml new file mode 100644 index 0000000000..6d78687fa7 --- /dev/null +++ b/java/distribution/src/main/assembly/bin-test.xml @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>java-bin-with-tests</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory>qpid-${qpid.version}</outputDirectory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + <include>README.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>..</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> + <fileSet> + <directory>target</directory> + <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> + <includes> + <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> + <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>../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>org.apache.qpid:qpid-distribution</exclude> + <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> + <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude> + <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude> + <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude> + <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude> + <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude> + <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude> + <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude> + <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude> + <exclude>org.eclipse.help:org.eclipse.help</exclude> + <exclude>org.eclipse.jface:org.eclipse.jface</exclude> + <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude> + <exclude>org.eclipse.swt:org.eclipse.swt</exclude> + <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude> + <exclude>org.eclipse.ui:org.eclipse.ui</exclude> + <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude> + <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> diff --git a/java/distribution/src/main/assembly/bin.xml b/java/distribution/src/main/assembly/bin.xml index fa3ed7dd06..00ffd86bd0 100644 --- a/java/distribution/src/main/assembly/bin.xml +++ b/java/distribution/src/main/assembly/bin.xml @@ -66,14 +66,6 @@ <include>qpid-incubating.jar</include> </includes> </fileSet> - <fileSet> - <directory>../perftests/bin</directory> - <outputDirectory>qpid-${qpid.version}/bin/perftests</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - </fileSets> <files> <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have diff --git a/java/distribution/src/main/assembly/client-bin.xml b/java/distribution/src/main/assembly/client-bin.xml deleted file mode 100644 index b9e9939c95..0000000000 --- a/java/distribution/src/main/assembly/client-bin.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<assembly> - <id>java-client-bin</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - - <moduleSets> - <moduleSet> - <includes> - <include>org.apache.qpid:client</include> - </includes> - <binaries> - <includeDependencies>true</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - - <fileSets> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory>qpid-${qpid.version}</outputDirectory> - <includes> - <include>DISCLAIMER</include> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - <include>README.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>..</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> - <fileSet> - <directory>target</directory> - <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> - <includes> - <include>qpid-incubating.jar</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> - <unpack>false</unpack> - <excludes> - <exclude>org.apache.qpid:qpid-distribution</exclude> - <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> - <exclude>org.eclipse.core:org.eclipse.core.expressions</exclude> - <exclude>org.eclipse.core:org.eclipse.core.jobs</exclude> - <exclude>org.eclipse.core:org.eclipse.core.runtime</exclude> - <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.auth</exclude> - <exclude>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</exclude> - <exclude>org.eclipse.equinox:org.eclipse.equinox.common</exclude> - <exclude>org.eclipse.equinox:org.eclipse.equinox.preferences</exclude> - <exclude>org.eclipse.equinox:org.eclipse.equinox.registry</exclude> - <exclude>org.eclipse.help:org.eclipse.help</exclude> - <exclude>org.eclipse.jface:org.eclipse.jface</exclude> - <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude> - <exclude>org.eclipse.swt:org.eclipse.swt</exclude> - <exclude>org.eclipse.swt:org.eclipse.swt.win32.win32.x86</exclude> - <exclude>org.eclipse.ui:org.eclipse.ui</exclude> - <exclude>org.eclipse.ui:org.eclipse.ui.forms</exclude> - <exclude>org.eclipse.ui:org.eclipse.ui.workbench</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> -</assembly> diff --git a/java/distribution/src/main/assembly/tests.xml b/java/distribution/src/main/assembly/tests.xml deleted file mode 100644 index bde542fc92..0000000000 --- a/java/distribution/src/main/assembly/tests.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<assembly> - <id>java-tests</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <directory>../broker/target</directory> - <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> - <includes> - <include>*-tests.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>../client/target</directory> - <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> - <includes> - <include>*-tests.jar</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <outputDirectory>qpid-${qpid.version}/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.apache.qpid:qpid-systests</include> - <include>org.apache.qpid:qpid-perftests</include> - </includes> - <scope>test</scope> - </dependencySet> - </dependencySets> - -</assembly> |