[jboss-svn-commits] JBL Code SVN: r22836 - in labs/jbossesb/workspace/skeagh: runtime/src/main/resources/META-INF/jbossesb/xsd and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-09-17 02:48:09 -0400 (Wed, 17 Sep 2008)
New Revision: 22836

Modified:
   labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/jms-inbound-router_01.xml
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd
Log:
Changed the complexType of jbossesb to contain a xs:all instead of a sequence.


Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/jms-inbound-router_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/jms-inbound-router_01.xml	2008-09-17 05:20:08 UTC (rev 22835)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/jms-inbound-router_01.xml	2008-09-17 06:48:09 UTC (rev 22836)
@@ -1,9 +1,5 @@
 <jbossesb xmlns="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
 
-    <services>
-        <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.jms.MyTestService"/>
-    </services> 
-
     <routing>
         <inRouters serviceCategory="service-cat" serviceName="service-a">
             <inRouter name="inrouter1" class="org.jboss.esb.jms.JmsInboundRouter">
@@ -15,5 +11,9 @@
         </inRouters>
     </routing>
     
+    <services>
+        <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.jms.MyTestService"/>
+    </services> 
+    
 
 </jbossesb>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd	2008-09-17 05:20:08 UTC (rev 22835)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd	2008-09-17 06:48:09 UTC (rev 22836)
@@ -7,11 +7,11 @@
     <xs:element name="jbossesb" type="jbossesb"/>
 
     <xs:complexType name="jbossesb">
-        <xs:sequence>
+        <xs:all>
             <xs:element name="resources" type="resources" minOccurs="0" maxOccurs="1"/>
             <xs:element name="services" type="services" minOccurs="0" maxOccurs="1"/>
             <xs:element name="routing" type="routing" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
+        </xs:all>
     </xs:complexType>
 
     <!--