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 2012/11/08 16:51:18 UTC
svn commit: r1407139 [2/2] - in /activemq/trunk: ./ activemq-http/
activemq-http/src/ activemq-http/src/main/ activemq-http/src/main/java/
activemq-http/src/main/java/org/ activemq-http/src/main/java/org/apache/
activemq-http/src/main/java/org/apache/a...
Copied: activemq/trunk/activemq-log4j-appender/src/test/resources/jndi.properties (from r1407102, activemq/trunk/activemq-optional/src/test/resources/jndi.properties)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-log4j-appender/src/test/resources/jndi.properties?p2=activemq/trunk/activemq-log4j-appender/src/test/resources/jndi.properties&p1=activemq/trunk/activemq-optional/src/test/resources/jndi.properties&r1=1407102&r2=1407139&rev=1407139&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties (from r1407102, activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/util/test-log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties?p2=activemq/trunk/activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties&p1=activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/util/test-log4j.properties&r1=1407102&r2=1407139&rev=1407139&view=diff
==============================================================================
(empty)
Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1407139&r1=1407138&r2=1407139&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Thu Nov 8 15:51:10 2012
@@ -60,7 +60,6 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1407139&r1=1407138&r2=1407139&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Thu Nov 8 15:51:10 2012
@@ -96,6 +96,15 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>activemq-log4j-appender</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>activemq-http</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1407139&r1=1407138&r2=1407139&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Nov 8 15:51:10 2012
@@ -230,7 +230,8 @@
<module>activemq-xmpp</module>
<module>activemq-itests-spring31</module>
<module>assembly</module>
-
+ <module>activemq-log4j-appender</module>
+ <module>activemq-http</module>
</modules>
@@ -247,6 +248,17 @@
<!-- =============================== -->
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-log4j-appender</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-amq-store</artifactId>
<version>${project.version}</version>
</dependency>