[jboss-svn-commits] JBL Code SVN: r8295 - in labs/jbossesb/trunk/product: core/listeners/tests/src/org/jboss/soa/esb/listeners/config etc/schemas/xml lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 13 12:37:20 EST 2006
Author: tfennelly
Date: 2006-12-13 12:37:12 -0500 (Wed, 13 Dec 2006)
New Revision: 8295
Modified:
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd
labs/jbossesb/trunk/product/lib/ext/jbosesb-config-model.jar
Log:
more xsd config updates
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-13 17:31:04 UTC (rev 8294)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-13 17:37:12 UTC (rev 8295)
@@ -24,8 +24,16 @@
import java.io.File;
import java.io.IOException;
+import org.apache.xmlbeans.XmlException;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.listeners.config.Generator;
+import org.jboss.soa.esb.listeners.config.ActionDocument.Action;
+import org.jboss.soa.esb.listeners.config.BusesDocument.Buses;
+import org.jboss.soa.esb.listeners.config.JbossesbDocument.Jbossesb;
+import org.jboss.soa.esb.listeners.config.JmsBusDocument.JmsBus;
+import org.jboss.soa.esb.listeners.config.JmsListenerDocument.JmsListener;
+import org.jboss.soa.esb.listeners.config.PropertyDocument.Property;
+import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import junit.framework.TestCase;
@@ -39,6 +47,48 @@
private File gatewayConfig;
private File awareConfig;
+ public void test_xmlbeansmodel() throws XmlException, IOException {
+ JbossesbDocument doc = JbossesbDocument.Factory.parse(getClass().getResourceAsStream("jbossesb_config_01.xml"));
+ Jbossesb jbossesb = doc.getJbossesb();
+ Buses buses = jbossesb.getBuses();
+ Service service;
+
+ // Check the bus..
+ assertEquals(1, buses.getBusArray().length);
+ JmsBus bus = (JmsBus)buses.getBusArray(0);
+ assertEquals("server1-jms", bus.getBusid());
+ assertEquals("ConnectionFactory", bus.getConnectionFactory());
+ assertEquals("org.jnp.interfaces.NamingContextFactory", bus.getJndiContextFactory());
+ assertEquals("localhost", bus.getJndiURL());
+
+ assertEquals(1, jbossesb.getServices().getServiceArray().length);
+ service = jbossesb.getServices().getServiceArray(0);
+ assertEquals("Bank", service.getCategory());
+ assertEquals("Reconciliation", service.getName());
+ assertEquals("Bank Reconciliation Service", service.getDescription());
+
+ assertEquals(2, service.getListeners().getListenerArray().length);
+ JmsListener listener = (JmsListener)service.getListeners().getListenerArray(0);
+ assertEquals("Bank-JMS-Gateway", listener.getName());
+ assertEquals("server1-jms", listener.getBusidref());
+ assertTrue(listener.getIsGateway());
+ assertEquals("queue/A", listener.getDestinationName());
+ assertEquals(JmsListener.DestinationType.QUEUE, listener.getDestinationType());
+ assertEquals("service='Reconciliation'", listener.getMessageSelector());
+ assertEquals(1, listener.getMaxThreads());
+
+ Action[] actions = service.getActions().getActionArray();
+ assertEquals(1, actions.length);
+ assertEquals("TestDefaultRouteAction", actions[0].getName());
+ assertEquals("org.jboss.soa.esb.actions.CbrProxyAction", actions[0].getClass1());
+ assertEquals("route", actions[0].getProcess());
+
+ assertEquals(1, actions[0].getPropertyArray().length);
+ Property property = actions[0].getPropertyArray(0);
+ assertEquals("propName", property.getName());
+ assertEquals("propValue", property.getValue());
+}
+
public void test_constructor() throws ConfigurationException, IOException {
try {
new Generator(null);
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-13 17:31:04 UTC (rev 8294)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-13 17:37:12 UTC (rev 8295)
@@ -2,7 +2,8 @@
<jbossesb xmlns="http://www.jboss.org/soa/esb/listeners/config">
<buses>
- <jms-bus busid="" connection-factory="ConnectionFactory"
+ <jms-bus busid="server1-jms"
+ connection-factory="ConnectionFactory"
jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
jndi-URL="localhost" />
</buses>
@@ -10,26 +11,30 @@
<service category="Bank" name="Reconciliation" description="Bank Reconciliation Service">
<listeners>
- <jms-listener name="Bank-JMS-Gateway" is-gateway="true"
+ <jms-listener name="Bank-JMS-Gateway"
+ is-gateway="true"
+ busidref="server1-jms"
destination-type="QUEUE"
destination-name="queue/A"
message-selector="service='Reconciliation'"
maxThreads="1"
/>
- <jms-listener name="Bank-Listener" is-gateway="false"
- connection-factory="ConnectionFactory"
+ <jms-listener name="Bank-Listener"
+ is-gateway="false"
+ busidref="server1-jms"
destination-type="TOPIC"
destination-name="queue/B"
- jndi-context-factory="org.jnp.interfaces.NamingContextFactory"
- jndi-URL="localhost"
message-selector="service='Reconciliation'"
maxThreads="2"
/>
</listeners>
<actions>
- <action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction" />
- </actions>
+ <action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction">
+ <property name="propName" value="propValue" />
+ </action>
+ </actions>
+
</service>
</services>
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd 2006-12-13 17:31:04 UTC (rev 8294)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd 2006-12-13 17:37:12 UTC (rev 8295)
@@ -10,6 +10,7 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="jesb:services" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="jesb:buses" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -41,12 +42,58 @@
</xsd:element>
<xsd:element name="action">
<xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="class" use="required" type="xsd:string"/>
<xsd:attribute name="process" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="property">
+ <xsd:complexType>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="value" use="required" type="xsd:string"/>
+ </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:complexContent>
+ <xsd:extension base="xsd:annotated">
+ <xsd:attribute name="busid" use="required" type="xsd:string" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </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="busid" use="required" type="xsd:string" />
+ <xsd:attribute name="connection-factory" use="required" type="xsd:string" />
+ <xsd:attribute name="jndi-context-factory" use="required" 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-->
+
<xsd:element name="listeners">
<xsd:complexType>
<xsd:sequence>
@@ -58,6 +105,7 @@
<xsd:complexContent>
<xsd:extension base="xsd:annotated">
<xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="is-gateway" use="required" type="xsd:boolean" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -69,7 +117,7 @@
<xsd:extension base="jesb:listener">
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="is-gateway" use="required" type="xsd:boolean" />
- <xsd:attribute name="connection-factory" use="required" type="xsd:string" />
+ <xsd:attribute name="busidref" use="required" type="xsd:string" />
<xsd:attribute name="destination-type" use="required">
<xsd:simpleType>
<xsd:restriction base = "xsd:NMTOKEN">
@@ -79,8 +127,6 @@
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="destination-name" use="required" type="xsd:string" />
- <xsd:attribute name="jndi-context-factory" use="required" type="xsd:string" />
- <xsd:attribute name="jndi-URL" use="required" type="xsd:anyURI" />
<xsd:attribute name="message-selector" type="xsd:string" />
<xsd:attribute name="maxThreads" use="required" type="xsd:int" />
</xsd:extension>
Modified: labs/jbossesb/trunk/product/lib/ext/jbosesb-config-model.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list