servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r574814 - in /incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples: loan-broker/ ws-notification/instance1/ ws-notification/instance2/ ws-notification/instance3/
Date Wed, 12 Sep 2007 07:18:30 GMT
Author: ffang
Date: Wed Sep 12 00:18:29 2007
New Revision: 574814

URL: http://svn.apache.org/viewvc?rev=574814&view=rev
Log:
get loan-broker and ws-notification working again

Modified:
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/build.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
    incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml

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=574814&r1=574813&r2=574814&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
Wed Sep 12 00:18:29 2007
@@ -92,8 +92,8 @@
     <mkdir dir="install"/>
     <mkdir dir="deploy"/>
     <copy todir="install">
-      <fileset dir="../../components" includes="*shared*"/>
-      <fileset dir="../../components" includes="*lwcontainer*"/>
+      <fileset dir="../../hotdeploy" includes="*shared*"/>
+      <fileset dir="../../hotdeploy" includes="*lwcontainer*"/>
     </copy>
     <copy file="${build.dir}/loanbroker-sa.zip" todir="deploy"/>
   </target>

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml?rev=574814&r1=574813&r2=574814&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance1/servicemix1.xml
Wed Sep 12 00:18:29 2007
@@ -20,12 +20,14 @@
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	   xmlns:amq="http://activemq.org/config/1.0"
 	   xmlns:test="http://servicemix.org/test">
-
+  <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
+        factory-method="makeInitialContext" singleton="true" />
   <!-- the JBI container -->
   <sm:container id="jbi" 
                 name="wsn1"
                 embedded="true"
-                MBeanServer="#jmxServer">
+                MBeanServer="#jmxServer"
+                createJmxConnector="false">
 
     <!-- Use a SEDA flow + JMS flow for clustering. -->
     <sm:flows>
@@ -44,7 +46,7 @@
                    serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1091/jmxrmi"
                    threaded="true"
                    daemon="true" 
-                   depends-on="rmiRegistry" />
+                   depends-on="rmiRegistry, jmxServer" />
 
   <!-- JMS connection factory -->
   <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?rev=574814&r1=574813&r2=574814&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
Wed Sep 12 00:18:29 2007
@@ -31,12 +31,15 @@
     <location>../lib/jaxb-impl-2.0.1.jar</location>
     <location>../lib/xfire-jsr181-api-1.0-M1.jar</location>
   </classpath>
+  <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
+        factory-method="makeInitialContext" singleton="true" />  
 
   <!-- the JBI container -->
   <sm:container id="jbi" 
                 name="wsn2"
                 embedded="true"
-                MBeanServer="#jmxServer">
+                MBeanServer="#jmxServer"
+                createJmxConnector="false">
 
     <!-- Use a SEDA flow + JMS flow for clustering. -->
     <sm:flows>
@@ -89,7 +92,7 @@
                    serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1092/jmxrmi"
                    threaded="true"
                    daemon="true" 
-                   depends-on="rmiRegistry" />
+                   depends-on="rmiRegistry jmxServer" />
 
   <!-- JMS connection factory -->
   <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">

Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?rev=574814&r1=574813&r2=574814&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
(original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
Wed Sep 12 00:18:29 2007
@@ -23,6 +23,8 @@
        xmlns:my="http://servicemix.apache.org/demo"
        xmlns:wsn="http://servicemix.apache.org/wsn/1.0">
 
+  <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory"
+        factory-method="makeInitialContext" singleton="true" />
   <!-- We need to include the WS-Notification component dependencies in the classpath
-->
   <classpath>
     <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
@@ -36,7 +38,8 @@
   <sm:container id="jbi" 
                 name="wsn3"
                 embedded="true" 
-                MBeanServer="#jmxServer">
+                MBeanServer="#jmxServer"
+                createJmxConnector="false">
 
     <!-- Use a SEDA flow + JMS flow for clustering. -->
     <sm:flows>
@@ -106,7 +109,7 @@
                    serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1093/jmxrmi"
                    threaded="true"
                    daemon="true" 
-                   depends-on="rmiRegistry" />
+                   depends-on="rmiRegistry jmxServer" />
 
   <!-- JMS connection factory -->
   <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">



Mime
View raw message