Author: chirino
Date: Thu Jul 13 09:01:51 2006
New Revision: 421654
URL: http://svn.apache.org/viewvc?rev=421654&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-701
The zip is now tunned for windows and the tar.* packages are tunned for unix.
The zip file bin directory only contains .bat files and all text files use dos
line endings.
the tar file bin directory only contains the shell files and all text files use
the unix line endings.
Added:
incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
- copied, changed from r421643,
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
incubator/activemq/trunk/assembly/src/release/LICENSE.txt
- copied unchanged from r421643,
incubator/activemq/trunk/assembly/LICENSE.txt
Removed:
incubator/activemq/trunk/assembly/LICENSE.txt
incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
Modified:
incubator/activemq/trunk/assembly/pom.xml
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/pom.xml?rev=421654&r1=421653&r2=421654&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Thu Jul 13 09:01:51 2006
@@ -291,34 +291,29 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
<executions>
- <!-- execution>
- <id>run</id>
+ <execution>
+ <id>unix-bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/descriptors/run-jar.xml</descriptor>
+ <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
</descriptors>
- <finalName>run</finalName>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
- <archive>
- <manifest>
- <mainClass>org.apache.activemq.console.Main</mainClass>
- </manifest>
- </archive>
</configuration>
- </execution -->
+ </execution>
<execution>
- <id>bin</id>
+ <id>windows-bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/descriptors/bin.xml</descriptor>
+ <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
</descriptors>
<finalName>${pom.artifactId}-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
Copied: incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
(from r421643, incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml)
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?p2=incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml&p1=incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml&r1=421643&r2=421654&rev=421654&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Jul
13 09:01:51 2006
@@ -15,43 +15,38 @@
limitations under the License.
-->
<assembly>
- <id>bin</id>
+ <id>unix-bin</id>
<formats>
<format>tar.gz</format>
<format>tar.bz2</format>
- <format>zip</format>
</formats>
<fileSets>
- <fileSet>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- </fileSet>
+ <!-- I don't think the STATUS file is required.
<fileSet>
<directory>..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>STATUS*</include>
</includes>
+ <lineEnding>unix</lineEnding>
</fileSet>
+ -->
<fileSet>
<directory>src/release</directory>
<outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/*</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/release/bin</directory>
<outputDirectory>/bin</outputDirectory>
- <includes>
- <include>activemq</include>
- <include>browse</include>
- <include>bstat</include>
- <include>list</include>
- <include>query</include>
- <include>shutdown</include>
- </includes>
+ <excludes>
+ <exclude>*.bat</exclude>
+ </excludes>
<fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target</directory>
@@ -69,14 +64,6 @@
</fileSet>
</fileSets>
<dependencySets>
- <!-- dependencySet>
- <outputDirectory>/bin</outputDirectory>
- <outputFileNameMapping>run.jar</outputFileNameMapping>
- <unpack>false</unpack>
- <includes>
- <include>incubator-activemq:activemq-console</include>
- </includes>
- </dependencySet -->
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
@@ -122,36 +109,5 @@
<include>xmlpull:xmlpull</include>
</includes>
</dependencySet>
- </dependencySets>
-
- <!--
- <fileSet>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- </fileSet>
- </fileSets>
-
-
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <unpack>true</unpack>
- <scope>runtime</scope>
- </dependencySet>
- </dependencySets>
- -->
-
+ </dependencySets>
</assembly>
Added: incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=421654&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
(added)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Thu
Jul 13 09:01:51 2006
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed 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>windows-bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- I don't think the STATUS file is required.
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>STATUS*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ -->
+ <fileSet>
+ <directory>src/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/*</exclude>
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>src/release/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>${pom.artifactId}-${pom.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>run.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ <include>commons-logging:commons-logging</include>
+ <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
+ <include>incubator-activemq:activemq-core</include>
+ <include>incubator-activemq:activeio-core</include>
+ <include>incubator-activemq:activemq-console</include>
+ <include>mx4j:mx4j</include>
+
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib/optional</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>incubator-activemq:activemq-rar</include>
+ <include>incubator-activemq:activemq-optional</include>
+ <include>incubator-activemq:activecluster</include>
+ <include>incubator-activemq:activemq-web</include>
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>org.mortbay.jetty:jetty</include>
+ <include>org.mortbay.jetty:jetty-util</include>
+ <include>org.mortbay.jetty:servlet-api-2.5</include>
+ <include>log4j:log4j</include>
+ <include>mx4j:mx4j-remote</include>
+ <include>mx4j:mx4j-tools</include>
+ <include>org.apache.derby:derby</include>
+
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ <include>org.springframework:spring</include>
+ <include>xstream:xstream</include>
+ <include>xmlpull:xmlpull</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
