From 1f1be5215f47755d3b080bee9bcc8b6e0ba19a77 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Thu, 1 May 2008 18:14:36 +0000
Subject: [PATCH] Including addtional spring bits in the assembly needed to get
 the default activemq configuration to boot up.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@652601 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                             |  8 ++++++++
 assembly/src/main/descriptors/common-bin.xml |  3 +++
 assembly/src/release/bin/activemq            |  2 +-
 assembly/src/release/bin/activemq.bat        |  2 +-
 pom.xml                                      | 18 ++++++++++++++++++
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 048c678ab0..1a60b6255a 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 99cae3a971..4fe2ff7369 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index d162451d74..56cfde6361 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -131,7 +131,7 @@ if [ -z "$ACTIVEMQ_OPTS" ] ; then
 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
 
diff --git a/assembly/src/release/bin/activemq.bat b/assembly/src/release/bin/activemq.bat
index 91c0f70c8b..d53b1a3b90 100755
--- a/assembly/src/release/bin/activemq.bat
+++ b/assembly/src/release/bin/activemq.bat
@@ -74,7 +74,7 @@ if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
 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"
 
diff --git a/pom.xml b/pom.xml
index 7bf85d1d4c..ba79b1d915 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>