activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r652601 - in /activemq/trunk: assembly/pom.xml assembly/src/main/descriptors/common-bin.xml assembly/src/release/bin/activemq assembly/src/release/bin/activemq.bat pom.xml
Date Thu, 01 May 2008 18:14:36 GMT
Author: chirino
Date: Thu May  1 11:14:36 2008
New Revision: 652601

URL: http://svn.apache.org/viewvc?rev=652601&view=rev
Log:
Including addtional spring bits in the assembly needed to get the default activemq configuration
to boot up.


Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/assembly/src/release/bin/activemq
    activemq/trunk/assembly/src/release/bin/activemq.bat
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=652601&r1=652600&r2=652601&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Thu May  1 11:14:36 2008
@@ -189,6 +189,14 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=652601&r1=652600&r2=652601&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Thu May  1 11:14:36 2008
@@ -146,6 +146,9 @@
         <include>org.apache.xbean:xbean-spring</include>
         <include>org.springframework:spring-core</include>
         <include>org.springframework:spring-beans</include>
+        <include>org.springframework:spring-context</include>
+        <include>org.springframework:spring-tx</include>
+        <include>org.springframework:spring-jms</include>
         <include>xstream:xstream</include>
         <include>xmlpull:xmlpull</include>
       </includes>

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=652601&r1=652600&r2=652601&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Thu May  1 11:14:36 2008
@@ -131,7 +131,7 @@
 fi
 
 if [ -z "$SUNJMX" ] ; then
-  #SUNJMX="-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"
+  #SUNJMX="-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"
   SUNJMX="-Dcom.sun.management.jmxremote"
 fi
 

Modified: activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=652601&r1=652600&r2=652601&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq.bat Thu May  1 11:14:36 2008
@@ -74,7 +74,7 @@
 if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true
 
 if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
-REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
+REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
 
 if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password
-Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
 

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=652601&r1=652600&r2=652601&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu May  1 11:14:36 2008
@@ -462,6 +462,24 @@
         <version>${spring-version}</version>
         <optional>true</optional>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>      
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jms</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>      
       <!--
       <dependency>
         <groupId>org.springframework</groupId>



Mime
View raw message