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 2007/08/21 19:19:27 UTC
svn commit: r568199 - in /incubator/servicemix/trunk: ./
deployables/serviceengines/servicemix-camel/ distributions/apache-servicemix/
distributions/apache-servicemix/src/main/assembly/
distributions/apache-servicemix/src/main/release/bin/ distribution...
Author: gnodet
Date: Tue Aug 21 10:19:25 2007
New Revision: 568199
URL: http://svn.apache.org/viewvc?rev=568199&view=rev
Log:
SM-1034: Use a single hotdeploy directory, put components inside it, and start servicemix in the SERVICEMIX_HOME directory by default
Added:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/
- copied from r567608, incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/deploy/
Removed:
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/deploy/
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/install/
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/pom.xml
incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/test-file.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/build.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt
incubator/servicemix/trunk/pom.xml
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/pom.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-camel/pom.xml Tue Aug 21 10:19:25 2007
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml Tue Aug 21 10:19:25 2007
@@ -446,13 +446,13 @@
</configuration>
</execution>
<execution>
- <id>copy-sas</id>
+ <id>copy-bridge-sa</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/sas</outputDirectory>
+ <outputDirectory>target/samples/bridge-${servicemix-version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -460,12 +460,37 @@
<version>${servicemix-version}</version>
<type>zip</type>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-loan-broker-sa</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/samples/loan-broker-${servicemix-version}</outputDirectory>
+ <artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
<artifactId>loan-broker-sa</artifactId>
<version>${servicemix-version}</version>
<type>zip</type>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-wsdl-first-sa</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <id>wsdl-first</id>
+ <outputDirectory>target/samples/wsdl-first-${servicemix-version}</outputDirectory>
+ <artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-sa</artifactId>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Tue Aug 21 10:19:25 2007
@@ -49,7 +49,7 @@
</fileSet>
<fileSet>
<directory>target/components</directory>
- <outputDirectory>components</outputDirectory>
+ <outputDirectory>hotdeploy</outputDirectory>
</fileSet>
<fileSet>
<directory>target/samples/servicemix-web-${servicemix-version}</directory>
@@ -76,23 +76,9 @@
<outputDirectory>lib/optional</outputDirectory>
</fileSet>
</fileSets>
- <files>
- <file>
- <source>${basedir}/target/sas/bridge-sa-${servicemix-version}.zip</source>
- <outputDirectory>examples/bridge</outputDirectory>
- </file>
- <file>
- <source>${basedir}/target/sas/wsdl-first-sa-${servicemix-version}.zip</source>
- <outputDirectory>examples/wsdl-first</outputDirectory>
- </file>
- <file>
- <source>${basedir}/target/sas/loan-broker-sa-${servicemix-version}.zip</source>
- <outputDirectory>examples/loan-broker-bpel</outputDirectory>
- </file>
- </files>
<dependencySets>
<dependencySet>
- <outputDirectory>components/lib</outputDirectory>
+ <outputDirectory>extras</outputDirectory>
<includes>
<include>org.apache.servicemix:servicemix-components</include>
<include>org.apache.servicemix:servicemix-beanflow</include>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix Tue Aug 21 10:19:25 2007
@@ -114,6 +114,12 @@
if [ ! -d "$SERVICEMIX_HOME" ]; then
die "SERVICEMIX_HOME is not valid: $SERVICEMIX_HOME"
fi
+
+ if [ "x$@" != "x" ]; then
+ SERVICEMIX_DATA=.
+ else
+ SERVICEMIX_DATA=$SERVICEMIX_HOME
+ fi
}
setupNativePath() {
@@ -182,7 +188,7 @@
}
setupDefaults() {
- DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM -Dderby.system.home=$SERVICEMIX_HOME/var -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote"
+ DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM -Dderby.system.home=$SERVICEMIX_HOME/data/derby -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote"
#Set the JVM_VENDOR specific JVM flags
if [ "$JVM_VENDOR" = "SUN" ]; then
@@ -240,7 +246,7 @@
unlimitFD
# Locate the ServiceMix home directory
- locateHome
+ locateHome $@
# Load system-wide servicemix configuration
maybeSource "/etc/servicemix.conf"
@@ -281,6 +287,7 @@
CYGHOME=`cygpath --windows "$HOME"`
fi
+ cd $SERVICEMIX_DATA
# Execute the Java Virtual Machine
# echo $JAVA \
# $JAVA_OPTS \
@@ -305,7 +312,7 @@
}
main() {
- init
+ init $@
run $@
}
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/bin/servicemix.bat Tue Aug 21 10:19:25 2007
@@ -47,6 +47,13 @@
call :warn SERVICEMIX_HOME is not valid: %SERVICEMIX_HOME%
goto END
)
+if "$ARGS" == "" goto :SERVICEMIX_DATA_NO_ARGS
+ set SERVICEMIX_DATA=.
+ goto SERVICEMIX_DATA_END
+:SERVICEMIX_DATA_NO_ARGS
+ set SERVICEMIX_DATA=$SERVICEMIX_HOME
+:SERVICEMIX_DATA_END
+
if "%JAVA_MAX_MEM%" == "" set JAVA_MAX_MEM=512M
@@ -117,6 +124,7 @@
:EXECUTE
rem Execute the Java Virtual Machine
+ cd $SERVICEMIX_DATA
"%JAVA%" %JAVA_OPTS% -classpath "%CLASSPATH%" %BOOT_OPTS% org.codehaus.classworlds.Launcher %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/conf/servicemix.xml Tue Aug 21 10:19:25 2007
@@ -48,8 +48,8 @@
<sm:container id="jbi"
rootDir="./data/smx"
MBeanServer="#jmxServer"
- installationDirPath="./install"
- deploymentDirPath="./deploy"
+ installationDirPath="./hotdeploy"
+ monitorDeploymentDirectory="false"
monitorInterval="1"
transactionManager="#transactionManager"
createJmxConnector="false"
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/build.xml Tue Aug 21 10:19:25 2007
@@ -21,11 +21,11 @@
<target name="setup">
- <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
- dest="../../lib/optional/jaxen-1.1-beta9.jar"
+ <get src="http://repo1.maven.org/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ dest="../../lib/optional/jaxen-1.1-beta-9.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
</target>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt Tue Aug 21 10:19:25 2007
@@ -33,7 +33,7 @@
directory. It then does a file transfer to the outbox directory.
Just copy the test-file.xml file into the inbox directory and you should
-see it apear in the outbox directory in a few seconds.
+see it appear in the outbox directory in a few seconds.
For more information see:
http://incubator.apache.org/servicemix/file-binding.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/build.xml Tue Aug 21 10:19:25 2007
@@ -21,11 +21,11 @@
<target name="setup">
- <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ <get src="http://repo1.maven.org/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
dest="../../lib/optional/jaxen-1.1-beta9.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
</target>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/test-file.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/test-file.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/test-file.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/test-file.xml Tue Aug 21 10:19:25 2007
@@ -19,6 +19,6 @@
-->
<sample id="555-3482">
<data>
- This is sample file that can be dropped into the ibox directory.
+ This is sample file that can be dropped into the inbox directory.
</data>
</sample>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml Tue Aug 21 10:19:25 2007
@@ -39,20 +39,20 @@
<mkdir dir="${comp.build.dir}"/>
<mkdir dir="${client.build.dir}"/>
- <get src="http://repo.mergere.com/maven2/org/logicblaze/lingo/lingo/1.3/lingo-1.3.jar"
+ <get src="http://repo1.maven.org/maven2/org/logicblaze/lingo/lingo/1.3/lingo-1.3.jar"
dest="../../lib/optional/lingo-1.3.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
+ <get src="http://repo1.maven.org/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
dest="../../lib/optional/commons-pool-1.2.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
+ <get src="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
dest="../../lib/optional/commons-collections-3.1.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/org/springframework/spring-jms/2.0.1/spring-jms-2.0.1.jar"
- dest="../../lib/optional/spring-jms-2.0.1.jar"
+ <get src="http://repo1.maven.org/maven2/org/springframework/spring-jms/2.0.6/spring-jms-2.0.6.jar"
+ dest="../../lib/optional/spring-jms-2.0.6.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
<path id="javac.classpath">
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/build.xml Tue Aug 21 10:19:25 2007
@@ -21,14 +21,14 @@
<target name="setup">
- <get src="http://repo.mergere.com/maven2/rome/rome/0.8/rome-0.8.jar"
+ <get src="http://repo1.maven.org/maven2/rome/rome/0.8/rome-0.8.jar"
dest="../../lib/optional/rome-0.8.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/jdom/jdom/1.0/jdom-1.0.jar"
+ <get src="http://repo1.maven.org/maven2/jdom/jdom/1.0/jdom-1.0.jar"
dest="../../lib/optional/jdom-1.0.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
</target>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/build.xml Tue Aug 21 10:19:25 2007
@@ -21,14 +21,14 @@
<target name="setup">
- <get src="http://repo.mergere.com/maven2/commons-vfs/commons-vfs/20050307052300/commons-vfs-20050307052300.jar"
+ <get src="http://repo1.maven.org/maven2/commons-vfs/commons-vfs/20050307052300/commons-vfs-20050307052300.jar"
dest="../../lib/optional/commons-vfs-20050307052300.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ <get src="http://repo1.maven.org/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
dest="../../lib/optional/jaxen-1.1-beta-9.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
</target>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/build.xml Tue Aug 21 10:19:25 2007
@@ -21,20 +21,20 @@
<target name="setup">
<mkdir dir="lib" />
- <get src="http://repo.mergere.com/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
+ <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
dest="../../lib/optional/junit-3.8.1.jar"
usetimestamp="true" />
- <get src="http://repo.mergere.com/maven2/quartz/quartz/1.5.1/quartz-1.5.1.jar"
+ <get src="http://repo1.maven.org/maven2/quartz/quartz/1.5.1/quartz-1.5.1.jar"
dest="../../lib/optional/quartz-1.5.1.jar"
usetimestamp="true" />
<copy todir="../../lib/optional">
- <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ <fileset dir="../../extras" includes="servicemix-components*.jar"/>
</copy>
<unzip dest="lib">
<patternset>
<include name="lib/*.jar"/>
</patternset>
- <fileset dir="../../components">
+ <fileset dir="../../hotdeploy">
<include name="*wsn2005*"/>
<include name="*shared*"/>
</fileset>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/build.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/build.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/build.xml Tue Aug 21 10:19:25 2007
@@ -48,13 +48,12 @@
</target>
<target name="setup" depends="build-sa" description="Setup servicemix">
- <mkdir dir="install"/>
- <mkdir dir="deploy"/>
- <copy todir="install">
- <fileset dir="../../components" includes="*wsn*"/>
- <fileset dir="../../components" includes="*http*"/>
- <fileset dir="../../components" includes="*shared*"/>
+ <mkdir dir="hotdeploy"/>
+ <copy todir="hotdeploy">
+ <fileset dir="../../hotdeploy" includes="*wsn*"/>
+ <fileset dir="../../hotdeploy" includes="*http*"/>
+ <fileset dir="../../hotdeploy" includes="*shared*"/>
</copy>
- <copy file="${build.dir}/soap-demo-sa.zip" todir="deploy"/>
+ <copy file="${build.dir}/soap-demo-sa.zip" todir="hotdeploy"/>
</target>
</project>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml Tue Aug 21 10:19:25 2007
@@ -61,8 +61,8 @@
<sm:container id="jbi"
rootDir="./data"
MBeanServer="#jmxServer"
- installationDirPath="./install"
- deploymentDirPath="./deploy"
+ installationDirPath="./hotdeploy"
+ monitorDeploymentDirectory="false"
flowName="seda">
<sm:activationSpecs>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt?rev=568199&r1=567608&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt Tue Aug 21 10:19:25 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-This directory allows you to drop JBI Component archives in here when starting up.
+This directory allows you to drop JBI artifacts in here when starting up.
Just copy a JBI Service Assembly in this directory for it to deploy
For more information see
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=568199&r1=568198&r2=568199&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Tue Aug 21 10:19:25 2007
@@ -201,7 +201,7 @@
<activemq-version>4.1.1</activemq-version>
<activeio-version>3.0.0-incubator</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
- <camel-version>1.1-SNAPSHOT</camel-version>
+ <camel-version>1.1.0</camel-version>
<jencks-version>2.0</jencks-version>
<jetty-version>6.1.5</jetty-version>
<geronimo-version>1.2-beta</geronimo-version>