You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/10/23 15:50:22 UTC

svn commit: r829062 - in /servicemix/smx4/nmr/trunk/examples/cluster: README.txt instances/smx1/deploy/cluster.xml instances/smx1/deploy/quartz.xml instances/smx2/deploy/camel.xml instances/smx2/deploy/cluster.xml pom.xml

Author: gertv
Date: Fri Oct 23 13:50:21 2009
New Revision: 829062

URL: http://svn.apache.org/viewvc?rev=829062&view=rev
Log:
SMX4NMR-169: NMR Cluster example is broken

Modified:
    servicemix/smx4/nmr/trunk/examples/cluster/README.txt
    servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/cluster.xml
    servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/quartz.xml
    servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/camel.xml
    servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/cluster.xml
    servicemix/smx4/nmr/trunk/examples/cluster/pom.xml

Modified: servicemix/smx4/nmr/trunk/examples/cluster/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/README.txt?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/README.txt (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/README.txt Fri Oct 23 13:50:21 2009
@@ -91,9 +91,9 @@
 
 Note that the maven url below may need to be changed.  It is pointing to the released version
 of Apache ServiceMix 4.x and the version may need to be modified. Something like:
-   mvn:org.apache.servicemix.features/apache-servicemix/4.0.0/xml/features
+   mvn:org.apache.servicemix.features/apache-servicemix/4.1.0-SNAPSHOT/xml/features
 
-smx@root:/> features:addUrl mvn:org.apache.servicemix.features/apache-servicemix/4.0.0/xml/features
+smx@root:/> features:addUrl mvn:org.apache.servicemix/apache-servicemix/4.1.0-SNAPSHOT/xml/features
 
 smx@root:/> features:install activemq
 smx@root:/> activemq:create-broker

Modified: servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/cluster.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/cluster.xml?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/cluster.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/cluster.xml Fri Oct 23 13:50:21 2009
@@ -21,10 +21,10 @@
   -->
 <features>
     <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
-    <repository>mvn:org.apache.servicemix.features/apache-servicemix/${servicemix.features.version}/xml/features</repository>
-    <feature name="cluster-example-smx2">
+    <repository>mvn:org.apache.servicemix/apache-servicemix/${servicemix.features.version}/xml/features</repository>
+    <feature name="cluster-example-smx1">
         <config name="org.apache.servicemix.jbi.cluster.config">
-            clusterName=smx2
+            clusterName=smx1
         </config>
         <feature>activemq</feature>
         <feature>jbi-cluster</feature>

Modified: servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/quartz.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/quartz.xml?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/quartz.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/instances/smx1/deploy/quartz.xml Fri Oct 23 13:50:21 2009
@@ -19,7 +19,6 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:quartz="http://servicemix.apache.org/quartz/1.0"
-       xmlns:camel="http://activemq.apache.org/camel/schema/spring"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
        xmlns:b="http://servicemix.apache.org/examples/camel"
        xsi:schemaLocation="
@@ -33,17 +32,15 @@
          http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
          http://servicemix.apache.org/quartz/1.0
          http://servicemix.apache.org/quartz/1.0/servicemix-quartz.xsd
-         http://activemq.apache.org/camel/schema/spring 
-         http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
          http://www.springframework.org/schema/osgi
          http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
     <!-- Define a quartz endpoint, firing JBI exchangs every 500 ms -->
-	<quartz:endpoint id="quartzEndpoint" service="b:service" endpoint="endpoint" targetService="b:receiver">
+    <quartz:endpoint id="quartzEndpoint" service="b:service" endpoint="endpoint" targetService="b:receiver">
         <quartz:trigger>
             <quartz:simple repeatCount="500" repeatInterval="500" startDelay="2000" />
         </quartz:trigger>
-	</quartz:endpoint>
+    </quartz:endpoint>
 	
 	<!-- Export the endpoints and create a service assembly -->
     <bean class="org.apache.servicemix.common.osgi.EndpointExporter" />

Modified: servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/camel.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/camel.xml?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/camel.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/camel.xml Fri Oct 23 13:50:21 2009
@@ -19,7 +19,7 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:quartz="http://servicemix.apache.org/quartz/1.0"
-       xmlns:camel="http://activemq.apache.org/camel/schema/spring"
+       xmlns:camel="http://camel.apache.org/schema/spring"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
        xmlns:b="http://servicemix.apache.org/examples/camel"
        xsi:schemaLocation="
@@ -33,8 +33,8 @@
          http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
          http://servicemix.apache.org/quartz/1.0
          http://servicemix.apache.org/quartz/1.0/servicemix-quartz.xsd
-         http://activemq.apache.org/camel/schema/spring 
-         http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+         http://camel.apache.org/schema/spring 
+         http://camel.apache.org/schema/spring/camel-spring.xsd
          http://www.springframework.org/schema/osgi
          http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 

Modified: servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/cluster.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/cluster.xml?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/cluster.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/instances/smx2/deploy/cluster.xml Fri Oct 23 13:50:21 2009
@@ -21,7 +21,7 @@
   -->
 <features>
     <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
-    <repository>mvn:org.apache.servicemix.features/apache-servicemix/${servicemix.features.version}/xml/features</repository>
+    <repository>mvn:org.apache.servicemix/apache-servicemix/${servicemix.features.version}/xml/features</repository>
     <feature name="cluster-example-smx2">
         <config name="org.apache.servicemix.jbi.cluster.config">
             clusterName=smx2

Modified: servicemix/smx4/nmr/trunk/examples/cluster/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/examples/cluster/pom.xml?rev=829062&r1=829061&r2=829062&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/examples/cluster/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/examples/cluster/pom.xml Fri Oct 23 13:50:21 2009
@@ -33,7 +33,7 @@
 
     <properties>
         <servicemix.nmr.version>${pom.version}</servicemix.nmr.version>
-        <servicemix.features.version>4.0.0</servicemix.features.version>
+        <servicemix.features.version>4.1.0-SNAPSHOT</servicemix.features.version>
     </properties>
 
     <build>
@@ -63,4 +63,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>