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 @@
org.springframework
spring-web
+
+ org.springframework
+ spring-tx
+
+
+ org.springframework
+ spring-jms
+
org.mortbay.jetty
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 @@
org.apache.xbean:xbean-spring
org.springframework:spring-core
org.springframework:spring-beans
+ org.springframework:spring-context
+ org.springframework:spring-tx
+ org.springframework:spring-jms
xstream:xstream
xmlpull:xmlpull
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 @@
${spring-version}
true
+
+ org.springframework
+ spring-context
+ ${spring-version}
+ true
+
+
+ org.springframework
+ spring-tx
+ ${spring-version}
+ true
+
+
+ org.springframework
+ spring-jms
+ ${spring-version}
+ true
+