[jboss-svn-commits] JBL Code SVN: r8267 - in labs/jbossesb/trunk/product: . core/listeners core/listeners/src/org/jboss/soa/esb/listeners/config core/listeners/src/org/jboss/soa/esb/listeners/message core/listeners/tests/src/org/jboss/soa/esb/listeners 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
Tue Dec 12 13:37:27 EST 2006
Author: tfennelly
Date: 2006-12-12 13:37:13 -0500 (Tue, 12 Dec 2006)
New Revision: 8267
Added:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/
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/lib/ext/jbosesb-config-model.jar
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd
Log:
Some xsd config mods.
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/build.xml 2006-12-12 18:37:13 UTC (rev 8267)
@@ -83,6 +83,10 @@
</java>
</sequential>
</macrodef>
+
+ <target name="generate-config-model">
+ <ant dir="core/listeners" target="generate-config-model"/>
+ </target>
<!-- Initialisation -->
<target name="org.jboss.esb.internal.init">
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-12 18:37:13 UTC (rev 8267)
@@ -98,7 +98,23 @@
core-3.2.0.666.jar,drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
commons-jci-core-1.0-406301.jar,commons-jci-eclipse-3.2.0.666.jar"/></copy>
</target>
+
+ <target name="generate-config-model">
+ <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="xbeans-classpath" />
+ <property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
+
+ <delete dir="${gendir}" /><mkdir dir="${gendir}" />
+
+ <xmlbean schema="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb.xsd"
+ classgendir="${gendir}/classes" srcgendir="${gendir}/src"
+
+ destfile="${gendir}/jbosesb-config-model.jar" classpathref="xbeans-classpath"/>
+ </target>
+ <path id="xbeans-classpath">
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" />
+ </path>
+
<target name="org.jboss.esb.listeners.test" description="Run tests for this module">
<!-- Compile listener tests -->
<ant dir="tests" target="org.jboss.esb.listeners.internal.test"/>
Added: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-12 18:37:13 UTC (rev 8267)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.listeners.config;
+
+import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
+import org.w3c.dom.Document;
+
+/**
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ESBAwareGenerator {
+
+ /**
+ * @param model
+ * @param serverName
+ */
+ public ESBAwareGenerator(XMLBeansModel model, String serverName) {
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @return
+ */
+ public Document generate() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Added: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-12 18:37:13 UTC (rev 8267)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.listeners.config;
+
+import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
+import org.w3c.dom.Document;
+
+/**
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class GatewayGenerator {
+
+ /**
+ * @param model
+ * @param serverName
+ */
+ public GatewayGenerator(XMLBeansModel model, String serverName) {
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @return
+ */
+ public Document generate() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Added: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-12 18:37:13 UTC (rev 8267)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.listeners.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.xmlbeans.XmlException;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.listeners.config.JbossesbDocument;
+import org.jboss.soa.esb.listeners.config.ServerDocument.Server;
+import org.w3c.dom.Document;
+
+/**
+ * ESB Configuration Generator.
+ * <p/>
+ * Generates a legacy/deprecated configuration fileset in accordance with the
+ * {@link org.jboss.soa.esb.helpers.ConfigTree} approach to ESB configuration. The
+ * generator input should be a configuration that has been validated against the
+ * JBoss ESB configuration schema (XMLSchema).
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class Generator {
+
+ /**
+ * Configuration model.
+ */
+ private XMLBeansModel model;
+
+ /**
+ * Public constructor.
+ * @param config The input configuration stream.
+ * @throws ConfigurationException Bad listener ESB configuration.
+ * @throws IOException Unable to read the ESB listener configuration.
+ */
+ public Generator(InputStream config) throws ConfigurationException, IOException {
+ if(config == null) {
+ throw new IllegalArgumentException("null 'config' arg in constructor call.");
+ }
+
+ // Parse the config into our internal model instance...
+ try {
+ JbossesbDocument doc = JbossesbDocument.Factory.parse(config);
+
+ // TODO: Get validation working from here - would save
+ // doc.validate();
+
+ model = new XMLBeansModel(doc);
+ } catch (XmlException e) {
+ throw new ConfigurationException("Error while processing ESB Listener configuration stream.", e);
+ }
+ }
+
+ /**
+ * Generate the configuration set for the named server in the supplied output directory.
+ * <p/>
+ * The names of the generated files will be <i><serverName></i>-esb-config.xml
+ * (ESB Aware Listeners configuration) and <i><serverName></i>-esb-config-gateway.xml
+ * (Gateway Listeners configuration).
+ *
+ * @param serverName The server name.
+ * @param outdir The output directory to where the configuration set is to be generated.
+ * The directory will be created if it doesn't already exist.
+ * @throws ConfigurationException Failed to generate configuration set.
+ */
+ public void generate(String serverName, File outdir) throws ConfigurationException {
+ if(serverName == null) {
+ throw new IllegalArgumentException("null 'serverName' arg in method call.");
+ }
+ if(outdir == null) {
+ throw new IllegalArgumentException("null 'outdir' arg in method call.");
+ }
+ if(!model.getServers().contains(serverName)) {
+ throw new IllegalArgumentException("No Server configs found for 'serverName' [" + serverName + "].");
+ }
+ if(!outdir.exists()) {
+ outdir.mkdirs();
+ if(!outdir.exists()) {
+ throw new IllegalArgumentException("Failed to create 'outdir' [" + outdir.getAbsolutePath() + "].");
+ }
+ }
+ if(!outdir.isDirectory()) {
+ throw new IllegalArgumentException("'outdir' exists, but is not a directory.");
+ }
+
+ // Generate the configuration for the ESB Aware listeners...
+ ESBAwareGenerator awareGenerator = new ESBAwareGenerator(model, serverName);
+ Document awareConfig = awareGenerator.generate();
+ // TODO: serialise config to outDir...
+
+ // Generate the configuration for the ESB Aware listeners...
+ GatewayGenerator gatewayGenerator = new GatewayGenerator(model, serverName);
+ Document gatewayConfig = gatewayGenerator.generate();
+ // TODO: serialise config to outDir...
+ }
+
+ /**
+ * Get the list of server names for which the configuration instance (supplied at
+ * construction)specifies configurations.
+ * @return List of server names.
+ */
+ public List<String> getServers() {
+ return model.getServers();
+ }
+
+ /**
+ * XMLBeans based model implementation.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ protected class XMLBeansModel {
+
+ /**
+ * XMLBeans config model instance.
+ */
+ private JbossesbDocument xmlBeansDoc;
+ /**
+ * Cache of server names for the server configs defined in the configuration.
+ */
+ private List<String> serverNames;
+
+ /**
+ * Constructor.
+ * @param xmlBeansDoc XMLBeans config model.
+ */
+ private XMLBeansModel(JbossesbDocument xmlBeansDoc) {
+ this.xmlBeansDoc = xmlBeansDoc;
+ }
+
+ /**
+ * Get the list of server names.
+ * @return List of server names.
+ */
+ public List<String> getServers() {
+ if(serverNames == null) {
+ Server[] servers = xmlBeansDoc.getJbossesb().getServers().getServerArray();
+ serverNames = new ArrayList<String>();
+
+ for(Server server : servers) {
+ serverNames.add(server.getName());
+ }
+ }
+
+ return serverNames;
+ }
+ }
+}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java 2006-12-12 18:37:13 UTC (rev 8267)
@@ -112,6 +112,14 @@
// this.pipelineExecutorPool.submit(chain);
new Thread(chain).start();
+
+ // Delete me - If I check the following line of code in, it's an accident!!
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
}
try { _controller.unRegister(_eprCategoryName, _eprName, _epr); }
Added: 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-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-12 18:37:13 UTC (rev 8267)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+
+package org.jboss.soa.esb.listeners.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.listeners.config.Generator;
+
+import junit.framework.TestCase;
+
+/**
+ * Generator unit tests.
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class GeneratorUnitTest extends TestCase {
+
+ private File outdir = new File("test-outdir");
+ private File awareConfig;
+ private File gatewayConfig;
+
+ public void test_constructor() throws ConfigurationException, IOException {
+ try {
+ new Generator(null);
+ fail("Expected IllegalArgumentException.");
+ } catch (IllegalArgumentException e) {
+ // OK
+ }
+ }
+
+ public void test_parse() throws ConfigurationException, IOException {
+ Generator generator = new Generator(getClass().getResourceAsStream("jbossesb_config_01.xml"));
+
+ List<String> serverNames = generator.getServers();
+ assertEquals(3, serverNames.size());
+ assertEquals("fileBankServer", serverNames.get(0));
+ assertEquals("inhouse-jboss-4.0.4", serverNames.get(1));
+ assertEquals("loanbroker-listener", serverNames.get(2));
+ }
+
+ public void test_generate() throws ConfigurationException, IOException {
+ test_generate_badargs(null, outdir, "");
+
+ Generator generator = new Generator(getClass().getResourceAsStream("jbossesb_config_01.xml"));
+ }
+
+ private void test_generate_badargs(String serverName, File outdir, String expectedMessage) throws ConfigurationException, IOException {
+ Generator generator = new Generator(getClass().getResourceAsStream("jbossesb_config_01.xml"));
+
+ try {
+ generator.generate(serverName, outdir);
+ fail("Expected IllegalArgumentException.");
+ } catch(IllegalArgumentException e) {
+ // Expected
+ if(!e.getMessage().startsWith(expectedMessage)) {
+ fail("Unexpected exception message. Expected message to start with [" + expectedMessage + "]. Message was " + e.getMessage());
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ if(awareConfig != null && awareConfig.exists()) {
+ awareConfig.delete();
+ }
+ if(gatewayConfig != null && gatewayConfig.exists()) {
+ gatewayConfig.delete();
+ }
+ if(outdir.exists()) {
+ outdir.delete();
+ }
+ }
+}
Added: 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-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-12 18:37:13 UTC (rev 8267)
@@ -0,0 +1,41 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://www.jboss.org/soa/esb/listeners/config" xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance">
+ <hosts>
+ <host name = "filebank" dnsName = "localhost"/>
+ <host name = "jmsbank" dnsName = "localhost"/>
+ <host name = "loanbroker" dnsName = "localhost"/>
+ <host name = "jms-provider" dnsName = "localhost"/>
+ </hosts>
+ <servers>
+ <server name = "fileBankServer" host = "fileBank" appserver = "jboss-4.0.3SP1">
+ <properties>
+ <property name = "java.naming.provider.url" value = "localhost:1099"/>
+ <property name = "java.naming.factory.initial" value = "org.jnp.interfaces.NamingContextFactory"/>
+ <property name = "java.naming.factory.url.pkgs" value = "org.jboss.naming:org.jnp.interfaces"/>
+ </properties>
+ </server>
+ <server name = "inhouse-jboss-4.0.4" host = "jms-provider" appserver = "jboss-4.0.4">
+ <properties>
+ <property name = "java.naming.provider.url" value = "localhost:1099"/>
+ <property name = "java.naming.factory.initial" value = "org.jnp.interfaces.NamingContextFactory"/>
+ <property name = "java.naming.factory.url.pkgs" value = "org.jboss.naming:org.jnp.interfaces"/>
+ </properties>
+ </server>
+ <server name = "loanbroker-listener" host = "loanbroker" appserver = "jbossesb"/>
+ </servers>
+ <buses>
+ <bus name = "bank-jms-channel" server = "fileBankServer" resourceType = "QUEUE" userName = "" password = ""/>
+ <bus name = "bank-ftp-channel" server = "inhouse-jboss-4.0.4" resourceType = "FTP" userName = "kurt" password = "secret"/>
+ </buses>
+ <services>
+ <service name = "filebank-gateway" category = "gateway" server = "loanbroker-listener" description = "This listener picks up files deposited by the fileBank" class = "org.jboss.soa.esb.FileBankGateway">
+ <listeners>
+ <listener description = "A File-Based listener" bus = "bank-ftp-bus"/>
+ <listener description = "A JMS-Based listener" bus = "bank-jms-bus"/>
+ </listeners>
+ <actions>
+ <action name = "TestDefaultRouteAction" process = "route" class = "org.jboss.soa.esb.actions.CbrProxyAction" service-category = "MessageRouting" service-name = "ContentBasedRoutingService"/>
+ </actions>
+ </service>
+ </services>
+</jbossesb>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd 2006-12-12 18:23:28 UTC (rev 8266)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb.xsd 2006-12-12 18:37:13 UTC (rev 8267)
@@ -1,21 +1,23 @@
<?xml version = "1.0" encoding = "UTF-8"?>
<!--Generated by Turbo XML 2.4.1.100. Conforms to w3c http://www.w3.org/2001/XMLSchema-->
-<xsd:schema xmlns:xsd = "http://www.w3.org/2001/XMLSchema"
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.jboss.org/soa/esb/listeners/config"
+ xmlns:jesb="http://www.jboss.org/soa/esb/listeners/config"
elementFormDefault = "qualified">
<xsd:element name = "jbossesb">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "hosts"/>
- <xsd:element ref = "servers"/>
- <xsd:element ref = "buses"/>
- <xsd:element ref = "services"/>
+ <xsd:element ref = "jesb:hosts"/>
+ <xsd:element ref = "jesb:servers"/>
+ <xsd:element ref = "jesb:buses"/>
+ <xsd:element ref = "jesb:services"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name = "hosts">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "host" maxOccurs = "unbounded"/>
+ <xsd:element ref = "jesb:host" maxOccurs = "unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -34,14 +36,14 @@
<xsd:element name = "servers">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "server" maxOccurs = "unbounded"/>
+ <xsd:element ref = "jesb:server" maxOccurs = "unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name = "server">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "properties" minOccurs="0"/>
+ <xsd:element ref = "jesb:properties" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name = "name" use = "required" type = "xsd:string"/>
<xsd:attribute name = "host" use = "required" type = "xsd:string"/>
@@ -51,7 +53,7 @@
<xsd:element name = "properties">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "property" maxOccurs = "unbounded"/>
+ <xsd:element ref = "jesb:property" maxOccurs = "unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -80,7 +82,7 @@
<xsd:element name = "buses">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "bus" maxOccurs = "unbounded"/>
+ <xsd:element ref = "jesb:bus" maxOccurs = "unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -96,15 +98,15 @@
<xsd:element name = "services">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "service"/>
+ <xsd:element ref = "jesb:service"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name = "service">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "listeners"/>
- <xsd:element ref = "actions"/>
+ <xsd:element ref = "jesb:listeners"/>
+ <xsd:element ref = "jesb:actions"/>
</xsd:sequence>
<xsd:attribute name = "name" use = "required" type = "xsd:string"/>
<xsd:attribute name = "description" use = "required" type = "xsd:string"/>
@@ -116,7 +118,7 @@
<xsd:element name = "listeners">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "listener" maxOccurs = "unbounded"/>
+ <xsd:element ref = "jesb:listener" maxOccurs = "unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -129,7 +131,7 @@
<xsd:element name = "actions">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref = "action"/>
+ <xsd:element ref = "jesb:action"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
Added: labs/jbossesb/trunk/product/lib/ext/jbosesb-config-model.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/lib/ext/jbosesb-config-model.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list