You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/01/16 04:14:12 UTC
svn commit: r369323 - in /incubator/activemq/trunk/assembly: maven.xml
pom.xml src/main/descriptors/all-jar.xml src/main/descriptors/bin.xml
src/main/descriptors/run-jar.xml
Author: chirino
Date: Sun Jan 15 19:14:10 2006
New Revision: 369323
URL: http://svn.apache.org/viewcvs?rev=369323&view=rev
Log:
Fixed up the m2 distribution. only thing not being included yet is the run jar and the amq rar
Added:
incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml
incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
Modified:
incubator/activemq/trunk/assembly/maven.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
Modified: incubator/activemq/trunk/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/maven.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/maven.xml (original)
+++ incubator/activemq/trunk/assembly/maven.xml Sun Jan 15 19:14:10 2006
@@ -204,11 +204,12 @@
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir="${project.root}">
<ant:exclude name="**/target/**"/>
- <ant:exclude name="**/CVS/**"/>
- <ant:exclude name="**/.*/**"/>
- <ant:exclude name="**/junit*.properties"/>
- <ant:exclude name="**/*~"/>
- <ant:exclude name="**/*.bak"/>
+ <ant:exclude name="*/bin/**"/>
+ <ant:exclude name="**/CVS/**"/>
+ <ant:exclude name="**/.*/**"/>
+ <ant:exclude name="**/junit*.properties"/>
+ <ant:exclude name="**/*~"/>
+ <ant:exclude name="**/*.bak"/>
</ant:fileset>
</ant:copy>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Sun Jan 15 19:14:10 2006
@@ -25,7 +25,7 @@
</parent>
<artifactId>activemq</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>ActiveMQ :: Assembly</name>
<description>Puts together the ActiveMQ distribution</description>
@@ -151,6 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
<phase>install</phase>
@@ -158,7 +159,10 @@
<goal>assembly</goal>
</goals>
<configuration>
- <descriptor>src/main/descriptors/bin.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/descriptors/all-jar.xml</descriptor>
+ <descriptor>src/main/descriptors/bin.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
Added: incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml?rev=369323&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml (added)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml Sun Jan 15 19:14:10 2006
@@ -0,0 +1,39 @@
+<?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></id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ <include>commons-logging:commons-logging</include>
+ <include>geronimo-spec:geronimo-spec-jms</include>
+ <include>geronimo-spec:geronimo-spec-j2ee-management</include>
+ <include>activeio:activeio</include>
+ <include>mx4j:mx4j</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Sun Jan 15 19:14:10 2006
@@ -61,7 +61,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
- <include>${pom.groupId}:activemq-ra</include>
+ <!-- <include>${pom.groupId}:activemq-ra</include> -->
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
<include>commons-httpclient:commons-httpclient</include>
Added: incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml?rev=369323&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml (added)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml Sun Jan 15 19:14:10 2006
@@ -0,0 +1,33 @@
+<?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>run</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>