[jboss-svn-commits] JBL Code SVN: r23234 - in labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing: scenario_006 and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Oct 1 06:16:02 EDT 2008


Author: tfennelly
Date: 2008-10-01 06:16:02 -0400 (Wed, 01 Oct 2008)
New Revision: 23234

Modified:
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/02-service-config.xml
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/03-deployment.xml
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml
Log:
changed some of the tests to define the routing inside the service - much cleaner and clearer IMO

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/02-service-config.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/02-service-config.xml	2008-10-01 10:14:17 UTC (rev 23233)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/02-service-config.xml	2008-10-01 10:16:02 UTC (rev 23234)
@@ -1,20 +1,18 @@
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
     
     <services>
-        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" />
-        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService" />
-    </services>
 
-    <routing>
-        <!--
-            Route the message from A to B....
-        -->
-        <outRouters serviceCategory="Service" serviceName="A">
+        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
+            <!--
+                Route the message from A to B....
+            -->
             <outRouter name="A_to_B_router" class="org.jboss.esb.routing.ServiceRouter">
                 <property name="toCategory">Service</property>
                 <property name="toService">B</property>
             </outRouter>
-        </outRouters>
-    </routing>
+        </service>
 
+        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService" />
+    </services>
+
 </jbossesb>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml	2008-10-01 10:14:17 UTC (rev 23233)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/01-deployment.xml	2008-10-01 10:16:02 UTC (rev 23234)
@@ -1,23 +1,16 @@
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
     
-    <routing>
-        <inRouters serviceCategory="Service" serviceName="A">
+    <services>
+        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
             <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
-        </inRouters>
-
-        <!--
-            Route the message from A to B....
-        -->
-        <outRouters serviceCategory="Service" serviceName="A">
+            <!--
+                Route the message from A to B....
+            -->
             <outRouter name="A_to_B_router" class="org.jboss.esb.routing.ServiceRouter">
                 <property name="toCategory">Service</property>
                 <property name="toService">B</property>
             </outRouter>
-        </outRouters>
-    </routing>
-
-    <services>
-        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" />
+        </service>
     </services>    
 
 </jbossesb>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/03-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/03-deployment.xml	2008-10-01 10:14:17 UTC (rev 23233)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/03-deployment.xml	2008-10-01 10:16:02 UTC (rev 23234)
@@ -1,13 +1,9 @@
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
 
     <services>
-        <service serviceCategory="Service" serviceName="C" serviceDescription="B Service" class="org.jboss.esb.TestService" />
+        <service serviceCategory="Service" serviceName="C" serviceDescription="B Service" class="org.jboss.esb.TestService">
+            <outRouter name="outrouter" class="org.jboss.esb.TestOutboundRouter" />
+        </service>
     </services>
 
-    <routing>
-        <outRouters serviceCategory="Service" serviceName="C">
-            <outRouter name="outrouter" class="org.jboss.esb.TestOutboundRouter" />
-        </outRouters>
-    </routing>
-    
 </jbossesb>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml	2008-10-01 10:14:17 UTC (rev 23233)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/01-deployment.xml	2008-10-01 10:16:02 UTC (rev 23234)
@@ -1,33 +1,20 @@
+
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
     
-    <routing>
-        <inRouters serviceCategory="Service" serviceName="A">
+    <services>
+        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService">
             <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter" />
-        </inRouters>
-
-        <!--
-            Route the message from A to B....
-        -->
-        <outRouters serviceCategory="Service" serviceName="A">
             <outRouter name="A_to_B_router" class="org.jboss.esb.routing.ServiceRouter">
                 <property name="toCategory">Service</property>
                 <property name="toService">B</property>
             </outRouter>
-        </outRouters>
-        <!--
-            Route the message from B to C....
-        -->
-        <outRouters serviceCategory="Service" serviceName="B">
+        </service>
+        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService">
             <outRouter name="B_to_C_router" class="org.jboss.esb.routing.ServiceRouter">
                 <property name="toCategory">Service</property>
                 <property name="toService">C</property>
             </outRouter>
-        </outRouters>
-    </routing>
-
-    <services>
-        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" />
-        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService" />
+        </service>
         <service serviceCategory="Service" serviceName="F" serviceDescription="F Service" class="org.jboss.esb.TestService" />
     </services>
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml	2008-10-01 10:14:17 UTC (rev 23233)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/01-deployment.xml	2008-10-01 10:16:02 UTC (rev 23234)
@@ -1,16 +1,12 @@
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
 
     <services>
-        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" mep="In-Out" />
-        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService" />
-    </services>
-
-    <routing>
-        <inRouters serviceCategory="Service" serviceName="A">
+        <service serviceCategory="Service" serviceName="A" serviceDescription="A Service" class="org.jboss.esb.TestService" mep="In-Out">
             <inRouter name="inrouter" class="org.jboss.esb.TestInboundRouter">
                 <replyTo serviceCategory="Service" serviceName="B" />
             </inRouter>
-        </inRouters>
-    </routing>
+        </service>
+        <service serviceCategory="Service" serviceName="B" serviceDescription="B Service" class="org.jboss.esb.TestService" />
+    </services>
 
 </jbossesb>
\ No newline at end of file




More information about the jboss-svn-commits mailing list