[jboss-svn-commits] JBL Code SVN: r8320 - in labs/jbossesb/trunk/product: core/listeners core/listeners/tests etc/schemas/xml lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 14 12:31:01 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-14 12:30:59 -0500 (Thu, 14 Dec 2006)
New Revision: 8320
Added:
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Removed:
labs/jbossesb/trunk/product/lib/ext/jbossesb-config-model.jar
Modified:
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
Log:
Renaming the xsd to include a version.
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-14 17:28:33 UTC (rev 8319)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-14 17:30:59 UTC (rev 8320)
@@ -6,6 +6,7 @@
<property name="org.jboss.esb.listeners.classes.dir" location="${org.jboss.esb.internal.dest}/classes/listeners"/>
<property name="org.jboss.esb.listeners.src.dir" location="src"/>
<property name="org.jboss.esb.root.dir" location="../.."/>
+ <property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
@@ -19,6 +20,7 @@
<path id="org.jboss.esb.listeners.default.classpath">
<path refid="org.jboss.esb.listeners.base.classpath"/>
+ <pathelement location="${gendir}/classes"/>
<pathelement location="${org.jboss.esb.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
@@ -43,18 +45,16 @@
<target name="purge" depends="clean">
</target>
- <target name="generate-config-model">
+ <target name="generate-config-model-1.0" depends="org.jboss.esb.listeners.prepare">
<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"
+ <xmlbean schema="${org.jboss.esb.root.dir}/etc/schemas/xml/jbossesb-1.0.xsd"
classgendir="${gendir}/classes" srcgendir="${gendir}/src"
- destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model.jar" classpathref="xbeans-classpath"/>
- <jar destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model.jar" update="true"
+ destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.jar" classpathref="xbeans-classpath"/>
+ <jar destfile="${org.jboss.esb.listeners.distrib.dir}/lib/jbossesb-config-model-1.0.jar" update="true"
basedir="${org.jboss.esb.root.dir}/etc/schemas/xml/"
- includes="jbossesb.xsd"/>
+ includes="jbossesb-1.0.xsd"/>
</target>
<path id="xbeans-classpath">
@@ -62,14 +62,14 @@
</path>
- <target name="org.jboss.esb.listeners.compile" depends="generate-config-model">
+ <target name="org.jboss.esb.listeners.compile">
<!-- Compile listeners -->
<antcall target="org.jboss.esb.listeners.internal.compile"/>
<!-- Compile listener tests -->
<ant inheritAll="true" dir="tests" target="org.jboss.esb.listeners.tests.compile"/>
</target>
- <target name="org.jboss.esb.listeners.internal.compile" depends="org.jboss.esb.listeners.prepare"
+ <target name="org.jboss.esb.listeners.internal.compile" depends="generate-config-model-1.0"
description="Compile all classes">
<javac
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-14 17:28:33 UTC (rev 8319)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-14 17:30:59 UTC (rev 8320)
@@ -8,6 +8,7 @@
<property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" location="../.."/>
+ <property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
<property name="org.jboss.esb.module.tests.conf.dir" location="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
<property environment="env"/>
@@ -24,6 +25,7 @@
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
+ <pathelement location="${gendir}/classes"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.module.tests.conf.dir}"/>
<!--
Added: 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 17:28:33 UTC (rev 8319)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-14 17:30:59 UTC (rev 8320)
@@ -0,0 +1,138 @@
+<?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"
+ 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="jesb:services" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="jesb:buses" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="services">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="jesb:service" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="service">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="jesb:listeners" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="jesb:actions" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="category" use="required" type="xsd:string"/>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="description" use="required" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="actions">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="jesb:action" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </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" 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" 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-->
+
+ <xsd:element name="listeners">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="jesb:listener" maxOccurs="unbounded" minOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:complexType name="listener">
+ <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>
+ <xsd:element name="listener" type="jesb:listener" abstract="true"/>
+
+ <xsd:element name="jms-listener" substitutionGroup="jesb:listener">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <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="busidref" use="required" type="xsd:string" />
+ <xsd:attribute name="destination-type" use="required">
+ <xsd:simpleType>
+ <xsd:restriction base = "xsd:NMTOKEN">
+ <xsd:enumeration value = "QUEUE"/>
+ <xsd:enumeration value = "TOPIC"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ <xsd:attribute name="destination-name" use="required" type="xsd:string" />
+ <xsd:attribute name="message-selector" type="xsd:string" />
+ <xsd:attribute name="maxThreads" use="required" type="xsd:int" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+</xsd:schema>
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/lib/ext/jbossesb-config-model.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list