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 2006/09/08 16:17:22 UTC
svn commit: r441505 [1/2] - in /incubator/servicemix/trunk: ./
apache-servicemix/ apache-servicemix/src/main/assembly/
apache-servicemix/src/main/release/conf/
apache-servicemix/src/main/release/examples/cluster/
apache-servicemix/src/main/release/exam...
Author: gnodet
Date: Fri Sep 8 07:17:13 2006
New Revision: 441505
URL: http://svn.apache.org/viewvc?view=rev&rev=441505
Log:
Merge 3.0 branch changes and switch to 3.1-SNAPSHOT
Added:
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/poller/
- copied from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/poller/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/poller/inbox/
- copied from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/poller/inbox/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/poller/servicemix-poller.xml
- copied unchanged from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/poller/servicemix-poller.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/writer/
- copied from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/writer/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/writer/outbox/
- copied from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/writer/outbox/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/writer/servicemix-writer.xml
- copied unchanged from r441476, incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/cluster/writer/servicemix-writer.xml
incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/classes/
- copied from r441476, incubator/servicemix/branches/servicemix-3.0/samples/servicemix-web/src/webapp/WEB-INF/classes/
incubator/servicemix/trunk/samples/servicemix-web/src/webapp/WEB-INF/classes/log4j.xml
- copied unchanged from r441476, incubator/servicemix/branches/servicemix-3.0/samples/servicemix-web/src/webapp/WEB-INF/classes/log4j.xml
Removed:
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/inbox/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/outbox/
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/servicemix-poller.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml
Modified:
incubator/servicemix/trunk/apache-servicemix/pom.xml
incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/README.txt
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/build.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/build.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
incubator/servicemix/trunk/build/pom.xml
incubator/servicemix/trunk/geronimo/deployer-service/pom.xml
incubator/servicemix/trunk/geronimo/deployer/pom.xml
incubator/servicemix/trunk/geronimo/pom.xml
incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml
incubator/servicemix/trunk/geronimo/servicemix/pom.xml
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/samples/basic/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-eip-su/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-http-su/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-jms-su/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-sa/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/pom.xml
incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/servicemix.xml
incubator/servicemix/trunk/samples/bridge/pom.xml
incubator/servicemix/trunk/samples/loan-broker/loan-broker-bpe-su/pom.xml
incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/pom.xml
incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/src/main/resources/servicemix.xml
incubator/servicemix/trunk/samples/loan-broker/loan-broker-sa/pom.xml
incubator/servicemix/trunk/samples/loan-broker/pom.xml
incubator/servicemix/trunk/samples/pom.xml
incubator/servicemix/trunk/samples/servicemix-web/README.txt
incubator/servicemix/trunk/samples/servicemix-web/pom.xml
incubator/servicemix/trunk/samples/servicemix-web/src/main/java/org/apache/servicemix/components/HelloWorldComponent.java
incubator/servicemix/trunk/samples/servicemix-web/src/webapp/examples/index.html
incubator/servicemix/trunk/samples/ws-sec/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/README.txt
incubator/servicemix/trunk/samples/wsdl-first/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-sa/pom.xml
incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml
incubator/servicemix/trunk/servicemix-beanflow/pom.xml
incubator/servicemix/trunk/servicemix-bpe/pom.xml
incubator/servicemix/trunk/servicemix-common/pom.xml
incubator/servicemix/trunk/servicemix-components/pom.xml
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java
incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
incubator/servicemix/trunk/servicemix-console/pom.xml
incubator/servicemix/trunk/servicemix-core/pom.xml
incubator/servicemix/trunk/servicemix-eip/pom.xml
incubator/servicemix/trunk/servicemix-http/pom.xml
incubator/servicemix/trunk/servicemix-itests/pom.xml
incubator/servicemix/trunk/servicemix-jbi/pom.xml
incubator/servicemix/trunk/servicemix-jms/pom.xml
incubator/servicemix/trunk/servicemix-jsr181/pom.xml
incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
incubator/servicemix/trunk/servicemix-sca/pom.xml
incubator/servicemix/trunk/servicemix-services/pom.xml
incubator/servicemix/trunk/servicemix-shared-compat/pom.xml
incubator/servicemix/trunk/servicemix-shared/pom.xml
incubator/servicemix/trunk/servicemix-soap/pom.xml
incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j-tests.properties
incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties
incubator/servicemix/trunk/tooling/jbi-maven-plugin/pom.xml
incubator/servicemix/trunk/tooling/pom.xml
incubator/servicemix/trunk/tooling/servicemix-archetypes-itests/pom.xml
incubator/servicemix/trunk/tooling/servicemix-binding-component/pom.xml
incubator/servicemix/trunk/tooling/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-eip-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-embedded-simple/pom.xml
incubator/servicemix/trunk/tooling/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-http-consumer-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-http-provider-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jms-consumer-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jms-provider-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-assembly/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-engine/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-unit/pom.xml
incubator/servicemix/trunk/tooling/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
incubator/servicemix/trunk/tooling/servicemix-shared-library/pom.xml
incubator/servicemix/trunk/tooling/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
Modified: incubator/servicemix/trunk/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>apache-servicemix</artifactId>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml Fri Sep 8 07:17:13 2006
@@ -60,10 +60,6 @@
</fileSet>
<fileSet>
<directory>target/samples/loan-broker-${servicemix-version}</directory>
- <outputDirectory>examples/loan-broker</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>target/samples/loan-broker-${servicemix-version}</directory>
<outputDirectory>examples/loan-broker-bpel</outputDirectory>
</fileSet>
<fileSet>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml Fri Sep 8 07:17:13 2006
@@ -32,7 +32,6 @@
<transportConnectors>
<transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
- <transportConnector uri="vm://localhost" discoveryUri="multicast://default"/>
</transportConnectors>
<networkConnectors>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml Fri Sep 8 07:17:13 2006
@@ -57,7 +57,7 @@
<sm:sedaFlow />
<sm:jcaFlow bootstrapContext="#bootstrapContext"
connectionManager="#connectionManager"
- jmsURL="vm://ServiceMix" />
+ jmsURL="tcp://localhost:61616" />
</sm:flows>
</sm:securedBroker>
</sm:broker>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/README.txt?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/README.txt (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/cluster/README.txt Fri Sep 8 07:17:13 2006
@@ -26,15 +26,17 @@
To start the servicemix servers using the sample configurations, just run:
-../../bin/servicemix servicemix-poller.xml
+cd poller
+../../../bin/servicemix servicemix-poller.xml
and
-../../bin/servicemix servicemix-writer.xml
+cd writer
+../../../bin/servicemix servicemix-writer.xml
This will start two ServiceMix containers.
One server have a file poller component, and the other one a file writer component.
-Just drop the test-file.xml in the inbox directory.
-It should be moved to the outbox directory.
+Just drop the test-file.xml in the poller/inbox directory.
+It should be moved to the writer/outbox directory.
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/build.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/build.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/loan-broker/build.xml Fri Sep 8 07:17:13 2006
@@ -70,6 +70,7 @@
<mkdir dir="install"/>
<mkdir dir="deploy"/>
<copy todir="install">
+ <fileset dir="../../components" includes="*shared*"/>
<fileset dir="../../components" includes="*lwcontainer*"/>
</copy>
<copy file="${build.dir}/loanbroker-sa.zip" todir="deploy"/>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/build.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/build.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/build.xml Fri Sep 8 07:17:13 2006
@@ -20,6 +20,7 @@
<project name="ws-notification" default="setup" basedir=".">
<target name="setup">
+ <mkdir dir="lib" />
<get src="http://repo.mergere.com/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
dest="../../lib/optional/junit-3.8.1.jar"
usetimestamp="true" />
@@ -29,14 +30,18 @@
<copy todir="../../lib/optional">
<fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
</copy>
- <unzip dest="../../lib/optional">
+ <unzip dest="lib">
<patternset>
<include name="lib/*.jar"/>
</patternset>
<fileset dir="../../components">
<include name="*wsn2005*"/>
+ <include name="*shared*"/>
</fileset>
</unzip>
+ <move todir="lib">
+ <fileset dir="lib/lib" />
+ </move>
</target>
</project>
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml Fri Sep 8 07:17:13 2006
@@ -25,7 +25,7 @@
<sm:container id="jbi"
name="wsn1"
embedded="true"
- MBeanServer="#mbeanServer">
+ MBeanServer="#jmxServer">
<sm:flow>
<bean class="org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow">
<property name="connectionFactory" ref="connectionFactory" />
@@ -37,18 +37,13 @@
</sm:container>
<!-- JMX server and connector -->
- <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
-
- <bean id="registry" class="mx4j.tools.naming.NamingService" init-method="start">
- <property name="port" value="1091"/>
- </bean>
-
- <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
- <property name="objectName" value="connector:name=rmi"/>
- <property name="serviceUrl" value="service:jmx:rmi:///jndi/rmi://localhost:1091/jmxrmi"/>
- <property name="threaded" value="true"/>
- <property name="daemon" value="true"/>
- </bean>
+ <sm:rmiRegistry id="rmiRegistry" port="1091" />
+ <sm:jmxServer id="jmxServer" locateExistingServerIfPossible="true" />
+ <sm:jmxConnector objectName="connector:name=rmi"
+ serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1091/jmxrmi"
+ threaded="true"
+ daemon="true"
+ depends-on="rmiRegistry" />
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml Fri Sep 8 07:17:13 2006
@@ -23,11 +23,10 @@
xmlns:my="http://servicemix.apache.org/demo">
<classpath>
- <location>../lib/junit-3.8.1.jar</location>
- <location>../lib/servicemix-wsn2005-3.0-SNAPSHOT.jar</location>
- <location>../lib/servicemix-common-3.0-SNAPSHOT.jar</location>
- <location>../lib/jaxb-api-2.0EA3.jar</location>
- <location>../lib/jaxb-impl-2.0EA3.jar</location>
+ <location>../lib/servicemix-wsn2005-3.1-incubating-SNAPSHOT.jar</location>
+ <location>../lib/servicemix-common-3.1-incubating-SNAPSHOT.jar</location>
+ <location>../lib/jaxb-api-2.0.jar</location>
+ <location>../lib/jaxb-impl-2.0.1.jar</location>
<location>../lib/xfire-jsr181-api-1.0-M1.jar</location>
</classpath>
@@ -35,12 +34,12 @@
<sm:container id="jbi"
name="wsn2"
embedded="true"
- MBeanServer="#mbeanServer">
- <sm:flow>
- <bean class="org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow">
- <property name="connectionFactory" ref="connectionFactory" />
- </bean>
- </sm:flow>
+ MBeanServer="#jmxServer">
+ <sm:flow>
+ <bean class="org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow">
+ <property name="connectionFactory" ref="connectionFactory" />
+ </bean>
+ </sm:flow>
<sm:activationSpecs>
@@ -78,18 +77,13 @@
</sm:container>
<!-- JMX server and connector -->
- <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
-
- <bean id="registry" class="mx4j.tools.naming.NamingService" init-method="start">
- <property name="port" value="1092"/>
- </bean>
-
- <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
- <property name="objectName" value="connector:name=rmi"/>
- <property name="serviceUrl" value="service:jmx:rmi:///jndi/rmi://localhost:1092/jmxrmi"/>
- <property name="threaded" value="true"/>
- <property name="daemon" value="true"/>
- </bean>
+ <sm:rmiRegistry id="rmiRegistry" port="1092" />
+ <sm:jmxServer id="jmxServer" locateExistingServerIfPossible="true" />
+ <sm:jmxConnector objectName="connector:name=rmi"
+ serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1092/jmxrmi"
+ threaded="true"
+ daemon="true"
+ depends-on="rmiRegistry" />
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml Fri Sep 8 07:17:13 2006
@@ -23,11 +23,10 @@
xmlns:my="http://servicemix.apache.org/demo">
<classpath>
- <location>../lib/junit-3.8.1.jar</location>
- <location>../lib/servicemix-wsn2005-3.0-SNAPSHOT.jar</location>
- <location>../lib/servicemix-common-3.0-SNAPSHOT.jar</location>
- <location>../lib/jaxb-api-2.0EA3.jar</location>
- <location>../lib/jaxb-impl-2.0EA3.jar</location>
+ <location>../lib/servicemix-wsn2005-3.1-incubating-SNAPSHOT.jar</location>
+ <location>../lib/servicemix-common-3.1-incubating-SNAPSHOT.jar</location>
+ <location>../lib/jaxb-api-2.0.jar</location>
+ <location>../lib/jaxb-impl-2.0.1.jar</location>
<location>../lib/xfire-jsr181-api-1.0-M1.jar</location>
</classpath>
@@ -35,7 +34,7 @@
<sm:container id="jbi"
name="wsn3"
embedded="true"
- MBeanServer="#mbeanServer">
+ MBeanServer="#jmxServer">
<sm:flow>
<bean class="org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow">
<property name="connectionFactory" ref="connectionFactory" />
@@ -94,17 +93,13 @@
</sm:container>
<!-- JMX server and connector -->
- <bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
-
- <bean id="registry" class="mx4j.tools.naming.NamingService" init-method="start">
- <property name="port" value="1093"/>
- </bean>
- <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
- <property name="objectName" value="connector:name=rmi"/>
- <property name="serviceUrl" value="service:jmx:rmi:///jndi/rmi://localhost:1093/jmxrmi"/>
- <property name="threaded" value="true"/>
- <property name="daemon" value="true"/>
- </bean>
+ <sm:rmiRegistry id="rmiRegistry" port="1093" />
+ <sm:jmxServer id="jmxServer" locateExistingServerIfPossible="true" />
+ <sm:jmxConnector objectName="connector:name=rmi"
+ serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1093/jmxrmi"
+ threaded="true"
+ daemon="true"
+ depends-on="rmiRegistry" />
<bean id="connectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/examples/wsn-http-binding/servicemix.xml Fri Sep 8 07:17:13 2006
@@ -26,8 +26,8 @@
<!-- the JBI container -->
<sm:container id="jbi"
- rootDir="./wdir"
- MBeanServer="#mbeanServer"
+ rootDir="./data"
+ MBeanServer="#jmxServer"
installationDirPath="./install"
deploymentDirPath="./deploy"
dumpStats="true"
Modified: incubator/servicemix/trunk/build/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/build/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/build/pom.xml (original)
+++ incubator/servicemix/trunk/build/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>build</artifactId>
Modified: incubator/servicemix/trunk/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/deployer-service/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/geronimo/deployer-service/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/deployer-service/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>deployer-service</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>servicemix-service</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>jar</type>
</dependency>
Modified: incubator/servicemix/trunk/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/deployer/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/geronimo/deployer/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/deployer/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>deployer</artifactId>
Modified: incubator/servicemix/trunk/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/geronimo/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.geronimo</groupId>
Modified: incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix-service</artifactId>
Modified: incubator/servicemix/trunk/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.servicemix.geronimo</groupId>
<artifactId>servicemix-service</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
<type>jar</type>
</dependency>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Fri Sep 8 07:17:13 2006
@@ -33,7 +33,7 @@
<artifactId>servicemix</artifactId>
<packaging>pom</packaging>
<name>ServiceMix</name>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<description>
ServiceMix is an open source ESB based on the Java Business
Integration framework - JSR-208
@@ -206,7 +206,7 @@
<jencks-version>1.3</jencks-version>
<jetty-version>6.0.0rc4</jetty-version>
<geronimo-version>1.1</geronimo-version>
- <servicemix-version>3.0-incubating-SNAPSHOT</servicemix-version>
+ <servicemix-version>3.1-incubating-SNAPSHOT</servicemix-version>
<wsdl4j-version>1.5.2</wsdl4j-version>
<commons-beanutils-version>1.7.0</commons-beanutils-version>
<woodstox-version>3.0.0</woodstox-version>
@@ -360,38 +360,11 @@
</profile>
</profiles>
- <pluginRepositories>
- <pluginRepository>
- <id>servicemix-m2-repo</id>
- <name>Servicemix Maven2 Repository</name>
- <url>http://servicemix.org/m2-repo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Maven Central Plugins Development Repository</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<repositories>
<!-- keep the central repo so that it is first tried -->
<repository>
<id>central</id>
- <url>http://repo.mergere.com/maven2/</url>
- </repository>
- <!-- Codehaus -->
- <repository>
- <id>codehaus</id>
- <url>http://repository.codehaus.org/</url>
+ <url>http://www.ibiblio.org/maven2</url>
</repository>
<!-- Dependencies not on central repo -->
<repository>
@@ -421,127 +394,127 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-services</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-console</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-gbean</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jms</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jsr181</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-sca</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-soap</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-soap</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-wsn2005</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-lwcontainer</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>servicemix-web</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>basic</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-beanflow</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -1459,11 +1432,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skip>true</skip>
<useFile>true</useFile>
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
<workingDir>${basedir}</workingDir>
-
<systemProperties>
<property>
<name>log4j.configuration</name>
@@ -1475,7 +1448,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -1488,6 +1461,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<archive>
<manifest>
@@ -1533,7 +1507,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
Modified: incubator/servicemix/trunk/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/basic/pom.xml (original)
+++ incubator/servicemix/trunk/samples/basic/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-eip-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-eip-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-eip-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-eip-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-http-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-http-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-http-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-http-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-jms-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-jms-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-jms-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jms</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-sa/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-sa/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-sa/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -39,22 +39,22 @@
<dependency>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-http-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-eip-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-xslt-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-jms-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.bridge</groupId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-lwcontainer</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/servicemix.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/servicemix.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/bridge-xslt-su/src/main/resources/servicemix.xml Fri Sep 8 07:17:13 2006
@@ -22,12 +22,12 @@
<classpath>
<location>.</location>
- <location>lib/servicemix-components-3.0-incubating-SNAPSHOT.jar</location>
+ <location>lib/servicemix-components-3.1-incubating-SNAPSHOT.jar</location>
</classpath>
<sm:serviceunit id="jbi">
<sm:activationSpecs>
- <sm:activationSpec service="b:xslt" endpoint="endpoint">
+ <sm:activationSpec id="xslt" service="b:xslt" endpoint="endpoint">
<sm:component>
<bean class="org.apache.servicemix.components.xslt.XsltComponent">
<property name="xsltResource" value="classpath:bridge.xslt" />
Modified: incubator/servicemix/trunk/samples/bridge/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/pom.xml (original)
+++ incubator/servicemix/trunk/samples/bridge/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
Modified: incubator/servicemix/trunk/samples/loan-broker/loan-broker-bpe-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/loan-broker-bpe-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/loan-broker-bpe-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/loan-broker/loan-broker-bpe-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-bpe</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
@@ -39,17 +39,17 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-lwcontainer</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/src/main/resources/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/src/main/resources/servicemix.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/src/main/resources/servicemix.xml (original)
+++ incubator/servicemix/trunk/samples/loan-broker/loan-broker-lw-su/src/main/resources/servicemix.xml Fri Sep 8 07:17:13 2006
@@ -23,13 +23,14 @@
<classpath>
<location>.</location>
- <location>lib/servicemix-components-3.0-incubating-SNAPSHOT.jar</location>
+ <location>lib/servicemix-components-3.1-incubating-SNAPSHOT.jar</location>
</classpath>
<sm:serviceunit id="jbi">
<sm:activationSpecs>
- <sm:activationSpec destinationService="lb:LoanBrokerService"
+ <sm:activationSpec id="jmsReceiver"
+ destinationService="lb:LoanBrokerService"
destinationOperation="lb:getLoanQuote">
<sm:component>
<bean class="org.apache.servicemix.components.jms.JmsServiceComponent">
@@ -44,13 +45,14 @@
</sm:component>
</sm:activationSpec>
- <sm:activationSpec interfaceName="ca:CreditAgency">
+ <sm:activationSpec id="creditAgency"
+ interfaceName="ca:CreditAgency">
<sm:component>
<bean class="loanbroker.CreditAgency" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec>
+ <sm:activationSpec id="bank1">
<sm:component>
<bean class="loanbroker.Bank">
<constructor-arg value="1" />
@@ -58,7 +60,7 @@
</sm:component>
</sm:activationSpec>
- <sm:activationSpec>
+ <sm:activationSpec id="bank2">
<sm:component>
<bean class="loanbroker.Bank">
<constructor-arg value="2" />
@@ -66,7 +68,7 @@
</sm:component>
</sm:activationSpec>
- <sm:activationSpec>
+ <sm:activationSpec id="bank3">
<sm:component>
<bean class="loanbroker.Bank">
<constructor-arg value="3" />
@@ -74,7 +76,7 @@
</sm:component>
</sm:activationSpec>
- <sm:activationSpec>
+ <sm:activationSpec id="bank4">
<sm:component>
<bean class="loanbroker.Bank">
<constructor-arg value="4" />
@@ -82,7 +84,7 @@
</sm:component>
</sm:activationSpec>
- <sm:activationSpec>
+ <sm:activationSpec id="bank5">
<sm:component>
<bean class="loanbroker.Bank">
<constructor-arg value="5" />
Modified: incubator/servicemix/trunk/samples/loan-broker/loan-broker-sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/loan-broker-sa/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/loan-broker-sa/pom.xml (original)
+++ incubator/servicemix/trunk/samples/loan-broker/loan-broker-sa/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
<artifactId>loan-broker-bpe-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
<artifactId>loan-broker-lw-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/pom.xml (original)
+++ incubator/servicemix/trunk/samples/loan-broker/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
Modified: incubator/servicemix/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/pom.xml (original)
+++ incubator/servicemix/trunk/samples/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix</groupId>
Modified: incubator/servicemix/trunk/samples/servicemix-web/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/README.txt?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/README.txt (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/README.txt Fri Sep 8 07:17:13 2006
@@ -23,4 +23,5 @@
and browse the application at
http://localhost:8080/servicemix-web
-
+and
+ http://localhost:8080/servicemix-web/examples/
Modified: incubator/servicemix/trunk/samples/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
@@ -62,20 +62,6 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring-v1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring-v2</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -85,6 +71,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: incubator/servicemix/trunk/samples/servicemix-web/src/main/java/org/apache/servicemix/components/HelloWorldComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/main/java/org/apache/servicemix/components/HelloWorldComponent.java?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/main/java/org/apache/servicemix/components/HelloWorldComponent.java (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/main/java/org/apache/servicemix/components/HelloWorldComponent.java Fri Sep 8 07:17:13 2006
@@ -29,7 +29,7 @@
protected boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out)
throws MessagingException {
- out.setContent(new StringSource("<hello>" + in.getProperty(property) + "</hello>"));
+ out.setContent(in.getContent());
return true;
}
Modified: incubator/servicemix/trunk/samples/servicemix-web/src/webapp/examples/index.html
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/src/webapp/examples/index.html?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/src/webapp/examples/index.html (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/src/webapp/examples/index.html Fri Sep 8 07:17:13 2006
@@ -22,6 +22,20 @@
<head>
<title>ServiceMix Web Examples</title>
<link rel="stylesheet" href="../style.css" type="text/css">
+</link>
+<script type="text/javascript">
+function post() {
+ var xmlhttp = new XMLHttpRequest();
+ xmlhttp.onreadystatechange=function() {
+ if (xmlhttp.readyState == 4) { /* 4 : état "complete" */
+ var response = document.getElementById("response");
+ response.value = "STATUS: " + xmlhttp.status + "\n" + xmlhttp.responseText
+ }
+ }
+ xmlhttp.open("POST", "../jbi/exampleUri/", true);
+ xmlhttp.send("<hello>" + document.getElementById("name").value + "</hello>");
+}
+</script>
</head>
<body>
@@ -30,11 +44,13 @@
<p>Welcome to the web examples for ServiceMix</p>
-Perform a GET into the HTTP binding <p>
-<form method="get" action="../jbi/exampleUri">
- <input type="text" name="name" value="James">
- <input type="submit" value="Submit">
-</form>
+Perform a GET into the HTTP binding
+<p>
+ <input type="text" id="name" name="name" value="James" onKeyUp="post();"></input>
+ <input type="submit" value="Submit" onClick="post();"></input>
+</p>
+<textarea id="response" style="width:400px;height:100px">
+</textarea>
</body>
</html>
Modified: incubator/servicemix/trunk/samples/ws-sec/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/ws-sec/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/ws-sec/pom.xml (original)
+++ incubator/servicemix/trunk/samples/ws-sec/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
Modified: incubator/servicemix/trunk/samples/wsdl-first/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/README.txt?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/README.txt (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/README.txt Fri Sep 8 07:17:13 2006
@@ -30,3 +30,9 @@
cd wsdl-first-sa
mvn jbi:projectDeploy
+You can browse the WSDL at
+ http://localhost:8192/PersonService/main.wsdl
+
+You can also open the client.html page in a browser
+to send a request to the service.
+
Modified: incubator/servicemix/trunk/samples/wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>samples</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
Modified: incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-http-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
Modified: incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-sa/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-sa/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/wsdl-first-sa/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-jsr181-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-http-su</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml (original)
+++ incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix-gbean</artifactId>
Modified: incubator/servicemix/trunk/servicemix-beanflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-beanflow/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-beanflow/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-beanflow/pom.xml Fri Sep 8 07:17:13 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -59,13 +59,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--
- <version>2.3-SNAPSHOT</version>
- -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--
+ <version>2.3-SNAPSHOT</version>
+ -->
<configuration>
- <forkMode>pertest</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <forkMode>pertest</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
Modified: incubator/servicemix/trunk/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-bpe/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix-bpe</artifactId>
Modified: incubator/servicemix/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-common/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-common/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix-common</artifactId>
Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/pom.xml?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Fri Sep 8 07:17:13 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <version>3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>servicemix-components</artifactId>
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsReceiverComponent.java Fri Sep 8 07:17:13 2006
@@ -45,56 +45,56 @@
if (template == null) {
throw new IllegalArgumentException("Must have a template set");
}
- connectionFactory = template.getConnectionFactory();
- /*
- * Component code did not work for JMS 1.02 compliant provider because uses APIs
- * that did not exist in JMS 1.02 : ConnectionFactory.createConnection,
- * Connection.createSession
- */
- if (template instanceof org.springframework.jms.core.JmsTemplate102) {
- //Note1 - would've preferred to call JmsTemplate102 methods but they are protected.
- if (template.isPubSubDomain()) {
- javax.jms.TopicConnection tc;
- connection = tc = ((javax.jms.TopicConnectionFactory)connectionFactory).createTopicConnection();
- session = tc.createTopicSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
- else {
- javax.jms.QueueConnection qc;
- connection = qc = ((javax.jms.QueueConnectionFactory)connectionFactory).createQueueConnection();
- session = qc.createQueueSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
- } else { // JMS 1.1 style
- connection = connectionFactory.createConnection();
- session = connection.createSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
-
- Destination defaultDestination = template.getDefaultDestination();
- if (defaultDestination == null) {
- defaultDestination = template.getDestinationResolver().resolveDestinationName(session, template.getDefaultDestinationName(),
- template.isPubSubDomain());
- }
-
- /*
- * Component code did not work for JMS 1.02 compliant provider because uses APIs
- * that did not exist in JMS 1.02: Session.createConsumer
- */
- if (template instanceof org.springframework.jms.core.JmsTemplate102) {
- //Note1 - would've preferred to call JmsTemplate102.createConsumer but it is protected. Code below is same.
- //Note2 - assert that defaultDestination is correct type according to isPubSubDomain()
- if (template.isPubSubDomain()) {
- consumer = ((javax.jms.TopicSession)session).createSubscriber((javax.jms.Topic)defaultDestination, selector, template.isPubSubNoLocal());
- } else {
- consumer = ((javax.jms.QueueSession)session).createReceiver((javax.jms.Queue)defaultDestination, selector);
- }
- } else { // JMS 1.1 style
- consumer = session.createConsumer(defaultDestination, selector);
- }
}
public void start() throws JBIException {
// Start receiving messages only when the component has actually been started.
super.start();
try {
+ connectionFactory = template.getConnectionFactory();
+ /*
+ * Component code did not work for JMS 1.02 compliant provider because uses APIs
+ * that did not exist in JMS 1.02 : ConnectionFactory.createConnection,
+ * Connection.createSession
+ */
+ if (template instanceof org.springframework.jms.core.JmsTemplate102) {
+ //Note1 - would've preferred to call JmsTemplate102 methods but they are protected.
+ if (template.isPubSubDomain()) {
+ javax.jms.TopicConnection tc;
+ connection = tc = ((javax.jms.TopicConnectionFactory)connectionFactory).createTopicConnection();
+ session = tc.createTopicSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+ else {
+ javax.jms.QueueConnection qc;
+ connection = qc = ((javax.jms.QueueConnectionFactory)connectionFactory).createQueueConnection();
+ session = qc.createQueueSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+ } else { // JMS 1.1 style
+ connection = connectionFactory.createConnection();
+ session = connection.createSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+
+ Destination defaultDestination = template.getDefaultDestination();
+ if (defaultDestination == null) {
+ defaultDestination = template.getDestinationResolver().resolveDestinationName(session, template.getDefaultDestinationName(),
+ template.isPubSubDomain());
+ }
+
+ /*
+ * Component code did not work for JMS 1.02 compliant provider because uses APIs
+ * that did not exist in JMS 1.02: Session.createConsumer
+ */
+ if (template instanceof org.springframework.jms.core.JmsTemplate102) {
+ //Note1 - would've preferred to call JmsTemplate102.createConsumer but it is protected. Code below is same.
+ //Note2 - assert that defaultDestination is correct type according to isPubSubDomain()
+ if (template.isPubSubDomain()) {
+ consumer = ((javax.jms.TopicSession)session).createSubscriber((javax.jms.Topic)defaultDestination, selector, template.isPubSubNoLocal());
+ } else {
+ consumer = ((javax.jms.QueueSession)session).createReceiver((javax.jms.Queue)defaultDestination, selector);
+ }
+ } else { // JMS 1.1 style
+ consumer = session.createConsumer(defaultDestination, selector);
+ }
connection.start();
consumer.setMessageListener(this);
} catch (JMSException e) {
@@ -104,12 +104,14 @@
public void stop() throws JBIException {
try {
+ if (consumer != null) {
+ consumer.close();
+ }
+ if (session != null) {
+ session.close();
+ }
if (connection != null) {
connection.close();
- } else if (session != null) {
- session.close();
- } else if (consumer != null) {
- consumer.close();
}
} catch (JMSException e) {
throw new JBIException("Unable to stop jms component");
Modified: incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java?view=diff&rev=441505&r1=441504&r2=441505
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/jms/JmsServiceComponent.java Fri Sep 8 07:17:13 2006
@@ -71,56 +71,56 @@
if (template == null) {
throw new IllegalArgumentException("Must have a template set");
}
- connectionFactory = template.getConnectionFactory();
- /*
- * Component code did not work for JMS 1.02 compliant provider because uses APIs
- * that did not exist in JMS 1.02 : ConnectionFactory.createConnection,
- * Connection.createSession
- */
- if (template instanceof org.springframework.jms.core.JmsTemplate102) {
- //Note1 - would've preferred to call JmsTemplate102 methods but they are protected.
- if (template.isPubSubDomain()) {
- javax.jms.TopicConnection tc;
- connection = tc = ((javax.jms.TopicConnectionFactory)connectionFactory).createTopicConnection();
- session = tc.createTopicSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
- else {
- javax.jms.QueueConnection qc;
- connection = qc = ((javax.jms.QueueConnectionFactory)connectionFactory).createQueueConnection();
- session = qc.createQueueSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
- } else { // JMS 1.1 style
- connection = connectionFactory.createConnection();
- session = connection.createSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
- }
-
- Destination defaultDestination = template.getDefaultDestination();
- if (defaultDestination == null) {
- defaultDestination = template.getDestinationResolver().resolveDestinationName(session, template.getDefaultDestinationName(),
- template.isPubSubDomain());
- }
-
- /*
- * Component code did not work for JMS 1.02 compliant provider because uses APIs
- * that did not exist in JMS 1.02: Session.createConsumer
- */
- if (template instanceof org.springframework.jms.core.JmsTemplate102) {
- //Note1 - would've preferred to call JmsTemplate102.createConsumer but it is protected. Code below is same.
- //Note2 - assert that defaultDestination is correct type according to isPubSubDomain()
- if (template.isPubSubDomain()) {
- consumer = ((javax.jms.TopicSession)session).createSubscriber((javax.jms.Topic)defaultDestination, selector, template.isPubSubNoLocal());
- } else {
- consumer = ((javax.jms.QueueSession)session).createReceiver((javax.jms.Queue)defaultDestination, selector);
- }
- } else { // JMS 1.1 style
- consumer = session.createConsumer(defaultDestination, selector);
- }
}
public void start() throws JBIException {
// Start receiving messages only when the component has actually been started.
super.start();
try {
+ connectionFactory = template.getConnectionFactory();
+ /*
+ * Component code did not work for JMS 1.02 compliant provider because uses APIs
+ * that did not exist in JMS 1.02 : ConnectionFactory.createConnection,
+ * Connection.createSession
+ */
+ if (template instanceof org.springframework.jms.core.JmsTemplate102) {
+ //Note1 - would've preferred to call JmsTemplate102 methods but they are protected.
+ if (template.isPubSubDomain()) {
+ javax.jms.TopicConnection tc;
+ connection = tc = ((javax.jms.TopicConnectionFactory)connectionFactory).createTopicConnection();
+ session = tc.createTopicSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+ else {
+ javax.jms.QueueConnection qc;
+ connection = qc = ((javax.jms.QueueConnectionFactory)connectionFactory).createQueueConnection();
+ session = qc.createQueueSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+ } else { // JMS 1.1 style
+ connection = connectionFactory.createConnection();
+ session = connection.createSession(template.isSessionTransacted(), template.getSessionAcknowledgeMode());
+ }
+
+ Destination defaultDestination = template.getDefaultDestination();
+ if (defaultDestination == null) {
+ defaultDestination = template.getDestinationResolver().resolveDestinationName(session, template.getDefaultDestinationName(),
+ template.isPubSubDomain());
+ }
+
+ /*
+ * Component code did not work for JMS 1.02 compliant provider because uses APIs
+ * that did not exist in JMS 1.02: Session.createConsumer
+ */
+ if (template instanceof org.springframework.jms.core.JmsTemplate102) {
+ //Note1 - would've preferred to call JmsTemplate102.createConsumer but it is protected. Code below is same.
+ //Note2 - assert that defaultDestination is correct type according to isPubSubDomain()
+ if (template.isPubSubDomain()) {
+ consumer = ((javax.jms.TopicSession)session).createSubscriber((javax.jms.Topic)defaultDestination, selector, template.isPubSubNoLocal());
+ } else {
+ consumer = ((javax.jms.QueueSession)session).createReceiver((javax.jms.Queue)defaultDestination, selector);
+ }
+ } else { // JMS 1.1 style
+ consumer = session.createConsumer(defaultDestination, selector);
+ }
connection.start();
consumer.setMessageListener(this);
} catch (JMSException e) {
@@ -130,12 +130,14 @@
public void stop() throws JBIException {
try {
+ if (consumer != null) {
+ consumer.close();
+ }
+ if (session != null) {
+ session.close();
+ }
if (connection != null) {
connection.close();
- } else if (session != null) {
- session.close();
- } else if (consumer != null) {
- consumer.close();
}
} catch (JMSException e) {
throw new JBIException("Unable to stop jms component");