You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dj...@apache.org on 2008/04/09 09:58:38 UTC
svn commit: r646214 - in /activemq/branches/activemq-4.1/assembly: pom.xml
src/main/descriptors/common-bin.xml src/main/descriptors/unix-src.xml
src/main/descriptors/windows-src.xml
Author: djencks
Date: Wed Apr 9 00:58:31 2008
New Revision: 646214
URL: http://svn.apache.org/viewvc?rev=646214&view=rev
Log:
more build tweaks
Modified:
activemq/branches/activemq-4.1/assembly/pom.xml
activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml
activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-src.xml
activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-src.xml
Modified: activemq/branches/activemq-4.1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/pom.xml?rev=646214&r1=646213&r2=646214&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/pom.xml (original)
+++ activemq/branches/activemq-4.1/assembly/pom.xml Wed Apr 9 00:58:31 2008
@@ -140,7 +140,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml?rev=646214&r1=646213&r2=646214&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml Wed Apr 9 00:58:31 2008
@@ -65,13 +65,13 @@
<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.geronimo.specs:geronimo-servlet_2.5_spec</include>
<include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring</include>
<include>xstream:xstream</include>
Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-src.xml?rev=646214&r1=646213&r2=646214&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-src.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-src.xml Wed Apr 9 00:58:31 2008
@@ -23,7 +23,7 @@
<fileSets>
<!-- Binary Files -->
<fileSet>
- <directory>..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -50,7 +50,7 @@
<!-- Text Files -->
<fileSet>
- <directory>..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*</include>
Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-src.xml?rev=646214&r1=646213&r2=646214&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-src.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-src.xml Wed Apr 9 00:58:31 2008
@@ -23,7 +23,7 @@
<fileSets>
<!-- Binary Files -->
<fileSet>
- <directory>..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -50,7 +50,7 @@
<!-- Text Files -->
<fileSet>
- <directory>..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*</include>