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/03/11 00:52:47 UTC
svn commit: r384957 - in /incubator/activemq/trunk: activemq-core/pom.xml
assembly/pom.xml assembly/src/main/descriptors/all-jar.xml
assembly/src/main/descriptors/bin.xml
assembly/src/main/descriptors/run-jar.xml pom.xml
Author: chirino
Date: Fri Mar 10 15:52:45 2006
New Revision: 384957
URL: http://svn.apache.org/viewcvs?rev=384957&view=rev
Log:
Applying patch http://jira.activemq.org/jira/secure/ManageAttachments.jspa?id=23767
Modified:
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/assembly/pom.xml
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
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Fri Mar 10 15:52:45 2006
@@ -190,11 +190,13 @@
<!-- Configure which tests are included/excuded -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.2-SNAPSHOT</version>
<configuration>
<forkMode>pertest</forkMode>
<childDelegation>false</childDelegation>
<useFile>true</useFile>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
<excludes>
<!-- These tests run too slow to execute as part of the unit tests -->
<exclude>**/DefaultStoreBrokerTest.*</exclude>
@@ -207,6 +209,18 @@
</excludes>
</configuration>
+ </plugin>
+
+ <!-- generate the attached tests jar -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Fri Mar 10 15:52:45 2006
@@ -31,39 +31,39 @@
<dependencies>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-ra</artifactId>
<type>rar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId>
<type>war</type>
<version>${project.version}</version>
@@ -138,33 +138,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
- <phase>compile</phase>
+ <id>bin</id>
+ <phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
<configuration>
- <descriptor>src/main/descriptors/jar.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/descriptors/bin.xml</descriptor>
+ </descriptors>
+ <finalName>activemq-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
- <executions>
<execution>
- <phase>install</phase>
+ <id>full</id>
+ <phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/all-jar.xml</descriptor>
- <descriptor>src/main/descriptors/bin.xml</descriptor>
- </descriptors>
+ </descriptors>
+ <finalName>activemq-full-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
Modified: 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=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml Fri Mar 10 15:52:45 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<assembly>
- <id></id>
+ <id>full</id>
<formats>
<format>jar</format>
</formats>
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=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Fri Mar 10 15:52:45 2006
@@ -43,13 +43,21 @@
</fileSets>
<dependencySets>
<dependencySet>
+ <outputDirectory>/bin</outputDirectory>
+ <outputFileNameMapping>run.jar</outputFileNameMapping>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.activemq:activemq-console</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
<include>activeio:activeio</include>
<include>mx4j:mx4j</include>
- <include>${pom.groupId}:activemq-core</include>
+ <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>
@@ -77,10 +85,6 @@
<include>mx4j:mx4j-remote</include>
<include>geronimo-spec:geronimo-spec-j2ee-jacc</include>
<include>log4j:log4j</include>
- <include>activeio:activeio</include>
- <include>activeio:activeio</include>
- <include>activeio:activeio</include>
- <include>activeio:activeio</include>
<include>activeio:activeio</include>
</includes>
</dependencySet>
Modified: 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=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml Fri Mar 10 15:52:45 2006
@@ -24,9 +24,8 @@
<dependencySet>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
- <scope>runtime</scope>
<includes>
- <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.activemq:activemq-console</include>
</includes>
</dependencySet>
</dependencySets>
Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=384957&r1=384956&r2=384957&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Fri Mar 10 15:52:45 2006
@@ -73,46 +73,6 @@
</pluginRepository>
</pluginRepositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <outputDirectory>bin</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <!-- <forkMode>pertest</forkMode> -->
- <forkMode>none</forkMode>
- </configuration>
- </plugin>
- <!-- generate the attached tests jar -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>activemq-core</module>
@@ -139,7 +99,7 @@
</license>
</licenses>
- <scm>
+ <scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/activemq/trunk</connection>
<developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/activemq/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/</url>
@@ -213,6 +173,7 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>2.2</version>
+ <optional>true</optional>
</dependency>
<!-- Used to configure the activemq logs -->
@@ -236,6 +197,7 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
+ <optional>true</optional>
</dependency>
<!-- Optional Spring Support -->
@@ -243,6 +205,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>1.2.4</version>
+ <optional>true</optional>
</dependency>
<!-- an optional discovery agent -->
@@ -250,6 +213,7 @@
<groupId>activecluster</groupId>
<artifactId>activecluster</artifactId>
<version>1.1-SNAPSHOT</version>
+ <optional>true</optional>
</dependency>
<!-- Optional Derby support-->
@@ -257,6 +221,7 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.1.0</version>
+ <optional>true</optional>
</dependency>
<!-- Optional Axion support -->
@@ -264,18 +229,21 @@
<groupId>axion</groupId>
<artifactId>axion</artifactId>
<version>1.0-M3-dev</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>1.0</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.3</version>
+ <optional>true</optional>
</dependency>
<!-- Optional HSQL DB Support -->
@@ -284,11 +252,13 @@
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.2.2</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2</version>
+ <optional>true</optional>
</dependency>
-->
@@ -296,6 +266,7 @@
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
+ <optional>true</optional>
</dependency>
<!-- Optional Journal Implementation -->
@@ -304,20 +275,23 @@
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>0.1.7</version>
+ <optional>true</optional>
</dependency>
-->
-
+
<!-- Optional Jabber support -->
<dependency>
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
<version>1.5.0</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
<version>1.5.0</version>
+ <optional>true</optional>
</dependency>
<!-- =============================== -->
@@ -481,7 +455,7 @@
<artifactId>ant</artifactId>
<version>1.6.2</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
<!--
@@ -509,19 +483,48 @@
</dependencies>
-->
- <distributionManagement>
- <!--
- <repository>
- <id>apache.releases</id>
- <name>Apache Repository</name>
- <url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
- </repository>
- -->
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Repository</name>
- <url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.1.3-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <outputDirectory>bin</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>