You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/11 15:52:26 UTC
svn commit: r666668 - in /servicemix/smx4/features/trunk: ./
activemq/activemq-osgi/ assembly/src/main/descriptors/
assembly/src/main/distribution/unix-shell/bin/
assembly/src/main/distribution/windows-text/bin/
assembly/src/main/filtered-resources/etc...
Author: gnodet
Date: Wed Jun 11 06:52:25 2008
New Revision: 666668
URL: http://svn.apache.org/viewvc?rev=666668&view=rev
Log:
Fix assembly
Modified:
servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/servicemix
servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/transaction/transaction/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml Wed Jun 11 06:52:25 2008
@@ -105,9 +105,13 @@
org.apache.geronimo.transaction*;resolution:=optional,
org.apache.activemq.ra*;resolution:=optional,
javax.transaction,
+ org.apache.activemq.broker,
+ org.apache.activemq.broker.jmx,
+ org.apache.activemq.store.kahadaptor,
org.apache.activemq.xbean,
org.apache.xbean.spring,
org.springframework.core,
+ org.springframework.beans.factory.config,
*
</Import-Package>
<Private-Package>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Jun 11 06:52:25 2008
@@ -110,6 +110,7 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
+ <include>org.apache.servicemix.document:org.apache.servicemix.document</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Jun 11 06:52:25 2008
@@ -101,6 +101,7 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
+ <include>org.apache.servicemix.document:org.apache.servicemix.document</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/servicemix
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/servicemix?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/servicemix (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/bin/servicemix Wed Jun 11 06:52:25 2008
@@ -88,19 +88,21 @@
# Increase the maximum file descriptors if we can
if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then
MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
+ if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD > /dev/null
+ # echo "ulimit -n" `ulimit -n`
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
fi
-
- ulimit -n $MAX_FD
- # echo "ulimit -n" `ulimit -n`
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
}
@@ -118,11 +120,11 @@
locateBase() {
if [ "x$SERVICEMIX_BASE" != "x" ]; then
- if [ ! -d "$SERVICEMIX_BASE" ]; then
- die "SERVICEMIX_BASE is not valid: $SERVICEMIX_BASE"
- fi
- else
- SERVICEMIX_BASE=$SERVICEMIX_HOME
+ if [ ! -d "$SERVICEMIX_BASE" ]; then
+ die "SERVICEMIX_BASE is not valid: $SERVICEMIX_BASE"
+ fi
+ else
+ SERVICEMIX_BASE=$SERVICEMIX_HOME
fi
}
@@ -212,7 +214,11 @@
fi
# Add the conf directory so it picks up the Log4J config
- CLASSPATH="$CLASSPATH:$SERVICEMIX_BASE/conf"
+ if [ "x$CLASSPATH" = "x" ]; then
+ CLASSPATH="$SERVICEMIX_HOME/lib/servicemix.jar:$SERVICEMIX_HOME/lib/servicemix-jaas-boot.jar"
+ else
+ CLASSPATH="$CLASSPATH:$SERVICEMIX_HOME/lib/servicemix.jar:$SERVICEMIX_HOME/lib/servicemix-jaas-boot.jar"
+ fi
DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
##
@@ -268,12 +274,11 @@
;;
esac
- JAR=$SERVICEMIX_HOME/lib/servicemix.jar
if $cygwin; then
SERVICEMIX_HOME=`cygpath --path --windows "$SERVICEMIX_HOME"`
SERVICEMIX_BASE=`cygpath --path --windows "$SERVICEMIX_BASE"`
fi
- exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" $OPTS -jar "$JAR" $*
+ exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" $OPTS -classpath "$CLASSPATH" org.apache.servicemix.kernel.main.Main $*
}
main() {
Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat Wed Jun 11 06:52:25 2008
@@ -107,7 +107,7 @@
:SERVICEMIX_PROFILER_END
rem Setup the classpath
-set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\classworlds-1.0.1.jar
+set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\servicemix.jar;%SERVICEMIX_HOME%\lib\servicemix-jaas-boot.jar
rem Execute the JVM or the load the profiler
if "%SERVICEMIX_PROFILER%" == "" goto :EXECUTE
@@ -118,7 +118,7 @@
:EXECUTE
SET OPTS=-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -jar "%SERVICEMIX_HOME%\lib\servicemix.jar" %*
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath %CLASSPATH% -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" org.apache.servicemix.kernel.main.Main %*
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Jun 11 06:52:25 2008
@@ -52,9 +52,12 @@
org.apache.servicemix.kernel.gshell.features-${servicemix.kernel.version}.jar=40
org.apache.servicemix.kernel.spring-${servicemix.kernel.version}.jar=40
org.apache.servicemix.kernel.gshell.log-${servicemix.kernel.version}.jar=40
+org.apache.servicemix.kernel.jaas.config-${servicemix.kernel.version}.jar=40
+org.apache.servicemix.kernel.jaas.keystore-${servicemix.kernel.version}.jar=40
org.apache.felix.prefs-${felix.prefs.version}.jar=30
xbean-classloader-${xbean.version}.jar=50
+org.apache.servicemix.document-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.api-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.commands-${servicemix.nmr.version}.jar=50
org.apache.servicemix.nmr.core-${servicemix.nmr.version}.jar=50
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jun 11 06:52:25 2008
@@ -102,22 +102,22 @@
<jaxws.api.version>2.1</jaxws.api.version>
<jencks.version>2.1</jencks.version>
<jetty.version>6.1.9</jetty.version>
- <jline.version>0.9.93</jline.version>
+ <jline.version>0.9.94</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
- <pax.logging.version>1.1.0</pax.logging.version>
+ <pax.logging.version>1.1.1</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<pax.web.version>0.4.1</pax.web.version>
<pax.web.extender.version>0.3.0</pax.web.extender.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.kernel.version>1.0-m3</servicemix.kernel.version>
- <servicemix.nmr.version>1.0-m1</servicemix.nmr.version>
+ <servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
+ <servicemix.nmr.version>1.0-m2-SNAPSHOT</servicemix.nmr.version>
<servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
- <spring.version>2.5.2</spring.version>
- <spring.osgi.version>1.0.2</spring.osgi.version>
+ <spring.version>2.5.4</spring.version>
+ <spring.osgi.version>1.1.0-m2</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
<xbean.version>3.4.1</xbean.version>
<commons-io.version>1.3.2</commons-io.version>
Modified: servicemix/smx4/features/trunk/transaction/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/pom.xml?rev=666668&r1=666667&r2=666668&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/transaction/pom.xml Wed Jun 11 06:52:25 2008
@@ -99,6 +99,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.transaction,
+ org.springframework.transaction,
org.jencks.factory
</Import-Package>
<Export-Package>