Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applying patch http://jira.activemq.org/jira/secure/ManageAttachments.jspa?id=23767 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@384957 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-03-10 23:52:45 +00:00
parent 4727a0f452
commit be50d8699c
6 changed files with 106 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-core/pom.xml
View File

@ -190,11 +190,13 @@
<!-- Configure which tests are included/excuded --> <!-- Configure which tests are included/excuded -->
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.1.2-SNAPSHOT</version>
<configuration> <configuration>
<forkMode>pertest</forkMode> <forkMode>pertest</forkMode>
<childDelegation>false</childDelegation> <childDelegation>false</childDelegation>
<useFile>true</useFile> <useFile>true</useFile>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes> <excludes>
<!-- These tests run too slow to execute as part of the unit tests --> <!-- These tests run too slow to execute as part of the unit tests -->
<exclude>**/DefaultStoreBrokerTest.*</exclude> <exclude>**/DefaultStoreBrokerTest.*</exclude>
@ -209,6 +211,18 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- generate the attached tests jar -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>

37
assembly/pom.xml
View File

@ -31,39 +31,39 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId> <artifactId>activemq-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId> <artifactId>activemq-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId> <artifactId>activemq-console</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId> <artifactId>activemq-optional</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-ra</artifactId> <artifactId>activemq-ra</artifactId>
<type>rar</type> <type>rar</type>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId> <artifactId>activemq-jaas</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-web</artifactId> <artifactId>activemq-web</artifactId>
<type>war</type> <type>war</type>
<version>${project.version}</version> <version>${project.version}</version>
@ -138,33 +138,34 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <id>bin</id>
<phase>package</phase>
<goals> <goals>
<goal>assembly</goal> <goal>assembly</goal>
</goals> </goals>
<configuration> <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> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution> <execution>
<phase>install</phase> <id>full</id>
<phase>package</phase>
<goals> <goals>
<goal>assembly</goal> <goal>assembly</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>src/main/descriptors/all-jar.xml</descriptor> <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> </configuration>
</execution> </execution>
</executions> </executions>

2
assembly/src/main/descriptors/all-jar.xml
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<assembly> <assembly>
<id></id> <id>full</id>
<formats> <formats>
<format>jar</format> <format>jar</format>
</formats> </formats>

14
assembly/src/main/descriptors/bin.xml
View File

@ -42,6 +42,14 @@
</fileSet> </fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet>
<outputDirectory>/bin</outputDirectory>
<outputFileNameMapping>run.jar</outputFileNameMapping>
<unpack>false</unpack>
<includes>
<include>org.apache.activemq:activemq-console</include>
</includes>
</dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib</outputDirectory> <outputDirectory>/lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
@ -49,7 +57,7 @@
<includes> <includes>
<include>activeio:activeio</include> <include>activeio:activeio</include>
<include>mx4j:mx4j</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>backport-util-concurrent:backport-util-concurrent</include>
<include>commons-logging:commons-logging</include> <include>commons-logging:commons-logging</include>
<include>geronimo-spec:geronimo-spec-jms</include> <include>geronimo-spec:geronimo-spec-jms</include>
@ -78,10 +86,6 @@
<include>geronimo-spec:geronimo-spec-j2ee-jacc</include> <include>geronimo-spec:geronimo-spec-j2ee-jacc</include>
<include>log4j:log4j</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>
<include>activeio:activeio</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

3
assembly/src/main/descriptors/run-jar.xml
View File

@ -24,9 +24,8 @@
<dependencySet> <dependencySet>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<unpack>true</unpack> <unpack>true</unpack>
<scope>runtime</scope>
<includes> <includes>
<include>org.apache.activemq:activemq-core</include> <include>org.apache.activemq:activemq-console</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

111
pom.xml
View File

@ -73,46 +73,6 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </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> <modules>
<module>activemq-core</module> <module>activemq-core</module>
@ -213,6 +173,7 @@
<groupId>org.apache.xbean</groupId> <groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId> <artifactId>xbean-spring</artifactId>
<version>2.2</version> <version>2.2</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Used to configure the activemq logs --> <!-- Used to configure the activemq logs -->
@ -236,6 +197,7 @@
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>2.1</version> <version>2.1</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional Spring Support --> <!-- Optional Spring Support -->
@ -243,6 +205,7 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring</artifactId> <artifactId>spring</artifactId>
<version>1.2.4</version> <version>1.2.4</version>
<optional>true</optional>
</dependency> </dependency>
<!-- an optional discovery agent --> <!-- an optional discovery agent -->
@ -250,6 +213,7 @@
<groupId>activecluster</groupId> <groupId>activecluster</groupId>
<artifactId>activecluster</artifactId> <artifactId>activecluster</artifactId>
<version>1.1-SNAPSHOT</version> <version>1.1-SNAPSHOT</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional Derby support--> <!-- Optional Derby support-->
@ -257,6 +221,7 @@
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.1.1.0</version> <version>10.1.1.0</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional Axion support --> <!-- Optional Axion support -->
@ -264,18 +229,21 @@
<groupId>axion</groupId> <groupId>axion</groupId>
<artifactId>axion</artifactId> <artifactId>axion</artifactId>
<version>1.0-M3-dev</version> <version>1.0-M3-dev</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-primitives</groupId> <groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId> <artifactId>commons-primitives</artifactId>
<version>1.0</version> <version>1.0</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>regexp</groupId> <groupId>regexp</groupId>
<artifactId>regexp</artifactId> <artifactId>regexp</artifactId>
<version>1.3</version> <version>1.3</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional HSQL DB Support --> <!-- Optional HSQL DB Support -->
@ -284,11 +252,13 @@
<groupId>hsqldb</groupId> <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId> <artifactId>hsqldb</artifactId>
<version>1.7.2.2</version> <version>1.7.2.2</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
<version>1.2</version> <version>1.2</version>
<optional>true</optional>
</dependency> </dependency>
--> -->
@ -296,6 +266,7 @@
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>1.2</version> <version>1.2</version>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional Journal Implementation --> <!-- Optional Journal Implementation -->
@ -304,6 +275,7 @@
<groupId>howl</groupId> <groupId>howl</groupId>
<artifactId>howl-logger</artifactId> <artifactId>howl-logger</artifactId>
<version>0.1.7</version> <version>0.1.7</version>
<optional>true</optional>
</dependency> </dependency>
--> -->
@ -312,12 +284,14 @@
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>smack</artifactId> <artifactId>smack</artifactId>
<version>1.5.0</version> <version>1.5.0</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>activemq</groupId> <groupId>activemq</groupId>
<artifactId>smackx</artifactId> <artifactId>smackx</artifactId>
<version>1.5.0</version> <version>1.5.0</version>
<optional>true</optional>
</dependency> </dependency>
<!-- =============================== --> <!-- =============================== -->
@ -509,19 +483,48 @@
</dependencies> </dependencies>
--> -->
<distributionManagement> <build>
<!-- <pluginManagement>
<repository> <plugins>
<id>apache.releases</id> <plugin>
<name>Apache Repository</name> <groupId>org.apache.maven.plugins</groupId>
<url>scpexe://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url> <artifactId>maven-surefire-plugin</artifactId>
</repository> <version>2.1.3-SNAPSHOT</version>
--> </plugin>
<snapshotRepository> </plugins>
<id>apache.snapshots</id> </pluginManagement>
<name>Apache Development Repository</name> <plugins>
<url>scpexe://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url> <plugin>
</snapshotRepository> <groupId>org.apache.maven.plugins</groupId>
</distributionManagement> <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> </project>