[jboss-svn-commits] JBL Code SVN: r8327 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config core/listeners/tests/src/org/jboss/soa/esb/listeners/config etc/schemas/xml

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

Author: kurt.stam at jboss.com
Date: 2006-12-14 13:55:11 -0500 (Thu, 14 Dec 2006)
New Revision: 8327

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java
   labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Log:
fixing xsd.

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java	2006-12-14 18:49:41 UTC (rev 8326)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java	2006-12-14 18:55:11 UTC (rev 8327)
@@ -78,6 +78,7 @@
 		//if this fails try using the 
 		if (validationInputStream==null) {
 			File validationFile = new File(validationFileName);
+			mLogger.debug("Validation file " + validationFileName + " exists?:" + validationFile.exists());
 			try {
 				validationInputStream = new FileInputStream(validationFile);
 			} catch (FileNotFoundException e) {
@@ -106,7 +107,7 @@
 						String configXml = ParamRepositoryFactory.getInstance().get(mConfigFileName);
 						mLogger.debug("Start validation on configXml=" + configXml);
 						InputSource xmlInputSource = new InputSource(new StringReader(configXml));
-						XmlValidator validator = new MockXmlValidatorImpl();
+						XmlValidator validator = new XmlValidatorImpl();
 						if (validator.validate(xmlInputSource, mValidationInputSource)) {
 							mLogger.debug("Configuration file " + mConfigFileName + " passed validation. Starting " +
 									" the generation process of the jbossesb-listener.xml and the jbossesb-gateway.xml.");

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java	2006-12-14 18:49:41 UTC (rev 8326)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/ConfigurationControlerUnitTest.java	2006-12-14 18:55:11 UTC (rev 8327)
@@ -44,7 +44,7 @@
 		String configFileName = TestEnvironmentUtil.getUserDir("product") 
 			+ "core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml";
 		String validationFileName = TestEnvironmentUtil.getUserDir("product") 
-			+ "etc/schemas/xml/jbossesb.xsd";
+			+ "etc/schemas/xml/jbossesb-1.0.xsd";
 		ConfigurationController configurationController = new ConfigurationController(configFileName, validationFileName);
 		Thread controller = new Thread(configurationController);
 		controller.start();

Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd	2006-12-14 18:49:41 UTC (rev 8326)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd	2006-12-14 18:55:11 UTC (rev 8327)
@@ -9,11 +9,42 @@
 	<xsd:element name="jbossesb" >
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="jesb:services" minOccurs="1" maxOccurs="1"/>
-				<xsd:element ref="jesb:buses" minOccurs="1" maxOccurs="1"/>
+			    <xsd:element ref="jesb:buses" minOccurs="1" maxOccurs="1"/>
+				<xsd:element ref="jesb:services" minOccurs="1" maxOccurs="1"/>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
+	
+	<!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+			Bus types.
+		 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+
+	<xsd:element name="buses">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="jesb:bus" maxOccurs="unbounded" minOccurs="1"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="bus">
+		<xsd:attribute name="busid" use="required" type="xsd:string" />
+	</xsd:complexType>
+	<xsd:element name="bus" type="jesb:bus" abstract="true"/>
+	
+	<xsd:element name="jms-bus" substitutionGroup="jesb:bus">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="jesb:bus">
+					<xsd:attribute name="connection-factory" use="required" type="xsd:string" />
+					<xsd:attribute name="jndi-context-factory" type="xsd:string" />
+					<xsd:attribute name="jndi-pkg-prefix" type="xsd:string" />
+					<xsd:attribute name="jndi-URL" use="required" type="xsd:anyURI" />
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	
+	
 	<xsd:element name="services">
 		<xsd:complexType>
 			<xsd:sequence>
@@ -58,35 +89,6 @@
 	</xsd:element>
 
 	<!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
-			Bus types.
-		 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
-
-	<xsd:element name="buses">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="jesb:bus" maxOccurs="unbounded" minOccurs="1"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="bus">
-		<xsd:attribute name="busid" use="required" type="xsd:string" />
-	</xsd:complexType>
-	<xsd:element name="bus" type="jesb:bus" abstract="true"/>
-	
-	<xsd:element name="jms-bus" substitutionGroup="jesb:bus">
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="jesb:bus">
-					<xsd:attribute name="connection-factory" use="required" type="xsd:string" />
-					<xsd:attribute name="jndi-context-factory" type="xsd:string" />
-					<xsd:attribute name="jndi-pkg-prefix" type="xsd:string" />
-					<xsd:attribute name="jndi-URL" use="required" type="xsd:anyURI" />
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
-	<!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
 			Listener types.
 		 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->