Author: gnodet
Date: Fri Sep 8 04:25:50 2006
New Revision: 441476
URL: http://svn.apache.org/viewvc?view=rev&rev=441476
Log:
Fix ws-notificatio example
Modified:
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/build.xml
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
Modified:
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/build.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/build.xml?view=diff&rev=441476&r1=441475&r2=441476
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/build.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/build.xml
Fri Sep 8 04:25:50 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/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml?view=diff&rev=441476&r1=441475&r2=441476
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
Fri Sep 8 04:25:50 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/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?view=diff&rev=441476&r1=441475&r2=441476
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
Fri Sep 8 04:25:50 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.0-incubating.jar</location>
+ <location>../lib/servicemix-common-3.0-incubating.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/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?view=diff&rev=441476&r1=441475&r2=441476
==============================================================================
---
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
(original)
+++
incubator/servicemix/branches/servicemix-3.0/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
Fri Sep 8 04:25:50 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.0-incubating.jar</location>
+ <location>../lib/servicemix-common-3.0-incubating.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">
