[jboss-cvs] JBossAS SVN: r83261 - in projects/metadata/trunk/src: main/resources/schema and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 22 03:12:18 EST 2009
Author: alex.loubyansky at jboss.com
Date: 2009-01-22 03:12:18 -0500 (Thu, 22 Jan 2009)
New Revision: 83261
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient51XSDBindingUnitTestCase.java
Removed:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient50XSDBindingUnitTestCase.java
Modified:
projects/metadata/trunk/src/main/resources/schema/jboss-client_5_1.xsd
projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
Log:
JBMETA-163, JBMETA-164 (jboss-client consistency is going to be tested only for jboss-client_5_1.xsd)
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClient51MetaData.java 2009-01-22 08:12:18 UTC (rev 83261)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.client.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * JBoss 5.1 specific meta data for JavaEE 5 clients.
+ *
+ * The only difference between the 5.0 version is the element order.
+ *
+ * @author <a href="mailto:alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="jboss-client", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JBOSS_NS, prefix = "jboss"),
+ @XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee"),
+ @XmlNs(namespaceURI = JavaEEMetaDataConstants.XSD_NS, prefix = "xsd")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="jboss-clientType", namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ propOrder={"descriptionGroup", "callbackHandler", "metadataComplete",
+ "jndiName", "jndiEnvironmentRefsGroup", "messageDestinations", "depends"})
+public class JBossClient51MetaData extends JBossClientMetaData
+{
+ private static final long serialVersionUID = 1;
+}
\ No newline at end of file
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-client_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-client_5_1.xsd 2009-01-22 07:47:25 UTC (rev 83260)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-client_5_1.xsd 2009-01-22 08:12:18 UTC (rev 83261)
@@ -4,328 +4,27 @@
xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
xmlns:jee="http://java.sun.com/xml/ns/javaee"
targetNamespace="http://www.jboss.com/xml/ns/javaee"
- version="5.0"
+ version="5.1"
elementFormDefault="qualified"
>
<xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_5.xsd"/>
+ <xsd:include schemaLocation="jboss-common_5_1.xsd"/>
<xsd:element name="jboss-client" type="jboss:jboss-clientType"/>
- <xsd:complexType name="ejb-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="home" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ejb-link" type="xsd:string" minOccurs="0"/>
- <xsd:element name="remote" type="xsd:string" minOccurs="0"/>
- <xsd:element name="type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ejb-ref-type" type="jboss:ejb-ref-typeType" minOccurs="0"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ejb-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="message-destinationType">
- <xsd:sequence>
- <xsd:group ref="jboss:descriptionGroup"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="message-destination-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="persistence-unit-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="persistence-unit-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="persistence-unit-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="message-destination-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="message-destination-link" type="xsd:string" minOccurs="0"/>
- <xsd:element name="message-destination-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="message-destination-usage" type="jboss:message-destination-usageType" minOccurs="0"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="message-destination-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="port-component-refType">
- <xsd:sequence>
- <xsd:element name="config-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="stub-property" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="config-file" type="xsd:string" minOccurs="0"/>
- <xsd:element name="call-property" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="enable-mtom" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="port-component-link" type="xsd:string" minOccurs="0"/>
- <xsd:element name="service-endpoint-interface" type="xsd:string" minOccurs="0"/>
- <xsd:element name="port-qname" type="xsd:QName" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="env-entryType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="env-entry-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="env-entry-value" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="env-entry-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
+
<xsd:complexType name="jboss-clientType">
<xsd:sequence>
<xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="callback-handler" type="xsd:string" minOccurs="0"/>
<xsd:element name="metadata-complete" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:sequence>
- <xsd:element name="env-entry" type="jboss:env-entryType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="service-ref" type="jboss:service-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref" type="jboss:message-destination-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="persistence-context-ref" type="jboss:persistence-context-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="persistence-unit-ref" type="jboss:persistence-unit-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="post-construct" type="jboss:lifecycle-callbackType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="pre-destroy" type="jboss:lifecycle-callbackType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
+ <xsd:group ref="jboss:jndiEnvironmentRefsGroup"/>
<xsd:element name="message-destinations" type="jboss:message-destinationType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="depends" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="version" type="xsd:string"/>
</xsd:complexType>
- <xsd:complexType name="ejb-local-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ejb-link" type="xsd:string" minOccurs="0"/>
- <xsd:element name="local-jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="ejb-ref-type" type="jboss:ejb-ref-typeType" minOccurs="0"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="local-home" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="local" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ejb-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="resource-env-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="resource-env-ref-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="resource-env-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:simpleType name="res-sharing-scopeType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Shareable"/>
- <xsd:enumeration value="Unshareable"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="injection-targetType">
- <xsd:sequence>
- <xsd:element name="injection-target-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target-class" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="res-authType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="SERVLET"/>
- <xsd:enumeration value="Container"/>
- <xsd:enumeration value="Application"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="service-ref_handlerType">
- <xsd:sequence>
- <xsd:group ref="jboss:descriptionGroup"/>
- <xsd:element name="handler-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="handler-class" type="xsd:string" minOccurs="0"/>
- <xsd:element name="init-param" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="soap-header" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="soap-role" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="port-name" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="propertyType">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:simpleType name="message-destination-usageType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="ConsumesProduces"/>
- <xsd:enumeration value="Consumes"/>
- <xsd:enumeration value="Produces"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="lifecycle-callbackType">
- <xsd:sequence>
- <xsd:element name="lifecycle-callback-class" type="xsd:string" minOccurs="0"/>
- <xsd:element name="lifecycle-callback-method" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="emptyType">
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="resource-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="res-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="res-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="res-auth" type="jboss:res-authType" minOccurs="0"/>
- <xsd:element name="res-sharing-scope" type="jboss:res-sharing-scopeType" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="res-url" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="persistence-context-refType">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="persistence-property" type="jboss:propertyType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="persistence-context-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="persistence-context-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="persistence-unit-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="service-refType">
- <xsd:sequence>
- <xsd:group ref="jboss:descriptionGroup"/>
- <xsd:element name="service-ref-type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="service-impl-class" type="xsd:string" minOccurs="0"/>
- <xsd:element name="wsdl-file" type="xsd:string" minOccurs="0"/>
- <xsd:element name="handler" type="jboss:service-ref_handlerType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="port-component-ref" type="jboss:port-component-refType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="service-interface" type="xsd:string" minOccurs="0"/>
- <xsd:element name="config-file" type="xsd:string" minOccurs="0"/>
- <xsd:element name="handler-chains" type="xsd:string" minOccurs="0"/>
- <xsd:element name="service-qname" type="xsd:QName" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="service-ref-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="key" type="xsd:string" minOccurs="0"/>
- <xsd:element name="handler-chain" type="xsd:string" minOccurs="0"/>
- <xsd:element name="config-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jaxrpc-mapping-file" type="xsd:string" minOccurs="0"/>
- <xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="wsdl-override" type="xsd:string" minOccurs="0"/>
- <xsd:element name="dependency-ignored" type="xsd:boolean" minOccurs="0"/>
- <xsd:element name="mapped-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="jndi-name" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ignore-dependency" type="jboss:emptyType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <xsd:simpleType name="ejb-ref-typeType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Session"/>
- <xsd:enumeration value="Entity"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="service-ref_handler-chainType">
- <xsd:sequence>
- <xsd:element name="service-name-pattern" type="xsd:QName" minOccurs="0"/>
- <xsd:element name="handler" type="jboss:service-ref_handlerType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="port-name-pattern" type="xsd:QName" minOccurs="0"/>
- <xsd:element name="protocol-bindings" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- <!-- Bring descriptionGroup into jboss namespace -->
- <xsd:group name="descriptionGroup">
- <xsd:sequence>
- <xsd:element name="description" type="jee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="display-name" type="jee:display-nameType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="icon" type="jee:iconType" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- </xsd:group>
-
- <!-- Bring jndiEnvirnmentRefsGroup info jboss namespace -->
- <xsd:group name="jndiEnvironmentRefsGroup">
- <xsd:sequence>
- <xsd:element name="env-entry" type="jboss:env-entryType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:group ref="jboss:service-refGroup" />
- <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="message-destination-ref" type="jboss:message-destination-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="persistence-context-ref" type="jboss:persistence-context-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="persistence-unit-ref" type="jboss:persistence-unit-refType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="post-construct" type="jboss:lifecycle-callbackType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="pre-destroy" type="jboss:lifecycle-callbackType" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- </xsd:group>
-
- <!-- Bring service-refGroup into jboss namespace from javaee_web_services_client_1_2 -->
- <xsd:group name="service-refGroup">
- <xsd:sequence>
- <xsd:element name="service-ref" type="jboss:service-refType" minOccurs="0" maxOccurs="unbounded">
- <xsd:key name="service-ref_handler-name-key">
- <xsd:selector xpath="jee:handler" />
- <xsd:field xpath="jee:handler-name" />
- </xsd:key>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
</xsd:schema>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd 2009-01-22 07:47:25 UTC (rev 83260)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd 2009-01-22 08:12:18 UTC (rev 83261)
@@ -153,14 +153,6 @@
</xsd:sequence>
</xsd:group>
- <xsd:complexType name="run-asType">
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="role-name" type="javaee:role-nameType" />
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID" />
- </xsd:complexType>
-
<xsd:group name="service-refGroup">
<xsd:sequence>
<xsd:element name="service-ref" type="jboss:service-refType" minOccurs="0" maxOccurs="unbounded">
@@ -366,50 +358,6 @@
</xsd:simpleContent>
</xsd:complexType>
- <xsd:complexType name="resource-managersType">
- <xsd:annotation>
- <xsd:documentation> The resource-managers element is used to declare resource managers. A
- resource has 3 names: - the "code name" is the name used in the code of the bean, supplied
- by the Bean Developer in the resource-ref section of the ejb-jar.xml file - the "xml name"
- is an intermediary name used by the Application Assembler to identify resources in the XML
- file. - the "runtime jndi name" is the actual jndi-name or url of the deployed resource, it
- is supplied by the Deployer. The mapping between the "code name" and the "xml name" is given
- in the resource-ref section for the bean. If not, jboss will assume that "xml name" = "code
- name". The mapping between the "xml name" and the "runtime jndi name" is given in a
- resource-manager section. If not, and if the datasource is of type javax.sql.DataSource,
- jboss will look for a javax.sql.DataSource in the jndi tree. Used in: jboss
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="resource-manager" type="jboss:resource-managerType" minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
- <xsd:complexType name="resource-managerType">
- <xsd:annotation>
- <xsd:documentation> The resource-manager element is used to provide a mapping between the "xml
- name" of a resource (res-name) and its "runtime jndi name" (res-jndi-name or res-url
- according to the type of the resource). If it is not provided, and if the type of the
- resource is javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the jndi
- tree. See resource-managers. Used in: resource-managers </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="res-name" type="javaee:xsdStringType"/>
- <xsd:choice>
- <xsd:element name="res-jndi-name" type="javaee:xsdStringType"/>
- <xsd:element name="res-url" type="javaee:xsdStringType"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- <xsd:attribute name="res-class" type="xsd:string"/>
- </xsd:complexType>
-
<xsd:complexType name="loader-repositoryType" mixed="true">
<xsd:annotation>
<xsd:documentation>
@@ -557,4 +505,21 @@
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="message-destinationType">
+ <xsd:annotation>
+ <xsd:documentation> The message-destination element is used to configure the jndi-name for a
+ message-destination in ejb-jar.xml Used in: assembly-descriptor </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:group ref="jboss:descriptionGroup"/>
+ <xsd:element name="message-destination-name" type="javaee:xsdStringType"/>
+ <xsd:choice>
+ <xsd:element name="jndi-name" type="javaee:xsdStringType"/>
+ <xsd:element name="mapped-name" type="javaee:xsdStringType"/>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
</xsd:schema>
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-01-22 07:47:25 UTC (rev 83260)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd 2009-01-22 08:12:18 UTC (rev 83261)
@@ -1302,25 +1302,6 @@
<!-- **************************************************** -->
- <xsd:complexType name="message-destinationType">
- <xsd:annotation>
- <xsd:documentation> The message-destination element is used to configure the jndi-name for a
- message-destination in ejb-jar.xml Used in: assembly-descriptor </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:group ref="jboss:descriptionGroup"/>
- <xsd:element name="message-destination-name" type="javaee:xsdStringType"/>
- <xsd:choice>
- <xsd:element name="jndi-name" type="javaee:xsdStringType"/>
- <xsd:element name="mapped-name" type="javaee:xsdStringType"/>
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
- <!-- **************************************************** -->
-
<xsd:complexType name="webservicesType">
<xsd:sequence>
<xsd:element name="contextRoot" type="javaee:string" minOccurs="0"/>
@@ -1561,4 +1542,56 @@
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="run-asType">
+ <xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="role-name" type="javaee:role-nameType" />
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" />
+ </xsd:complexType>
+
+ <xsd:complexType name="resource-managersType">
+ <xsd:annotation>
+ <xsd:documentation> The resource-managers element is used to declare resource managers. A
+ resource has 3 names: - the "code name" is the name used in the code of the bean, supplied
+ by the Bean Developer in the resource-ref section of the ejb-jar.xml file - the "xml name"
+ is an intermediary name used by the Application Assembler to identify resources in the XML
+ file. - the "runtime jndi name" is the actual jndi-name or url of the deployed resource, it
+ is supplied by the Deployer. The mapping between the "code name" and the "xml name" is given
+ in the resource-ref section for the bean. If not, jboss will assume that "xml name" = "code
+ name". The mapping between the "xml name" and the "runtime jndi name" is given in a
+ resource-manager section. If not, and if the datasource is of type javax.sql.DataSource,
+ jboss will look for a javax.sql.DataSource in the jndi tree. Used in: jboss
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="resource-manager" type="jboss:resource-managerType" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="resource-managerType">
+ <xsd:annotation>
+ <xsd:documentation> The resource-manager element is used to provide a mapping between the "xml
+ name" of a resource (res-name) and its "runtime jndi name" (res-jndi-name or res-url
+ according to the type of the resource). If it is not provided, and if the type of the
+ resource is javax.sql.DataSource, jboss will look for a javax.sql.DataSource in the jndi
+ tree. See resource-managers. Used in: resource-managers </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="res-name" type="javaee:xsdStringType"/>
+ <xsd:choice>
+ <xsd:element name="res-jndi-name" type="javaee:xsdStringType"/>
+ <xsd:element name="res-url" type="javaee:xsdStringType"/>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ <xsd:attribute name="res-class" type="xsd:string"/>
+ </xsd:complexType>
+
</xsd:schema>
Deleted: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient50XSDBindingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient50XSDBindingUnitTestCase.java 2009-01-22 07:47:25 UTC (rev 83260)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient50XSDBindingUnitTestCase.java 2009-01-22 08:12:18 UTC (rev 83261)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY 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 along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.metadata.binding;
-
-import org.jboss.metadata.client.jboss.JBossClient5MetaData;
-
-/**
- * A JBossClient50XSDBindingUnitTestCase.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class JBossClient50XSDBindingUnitTestCase extends SchemaBindingValidationTest
-{
-
- public JBossClient50XSDBindingUnitTestCase(String name)
- {
- super(name);
- }
-
- public void configureLogging()
- {
- super.configureLogging();
- //enableTrace(getClass().getName());
- }
-
- public void testJBossClient50() throws Exception
- {
- //TODO assertEquivalent("jboss-client_5_1.xsd", JBossClient5MetaData.class);
- }
-}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient51XSDBindingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient51XSDBindingUnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/JBossClient51XSDBindingUnitTestCase.java 2009-01-22 08:12:18 UTC (rev 83261)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.metadata.binding;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.metadata.client.jboss.JBossClient51MetaData;
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+
+/**
+ * A JBossClient50XSDBindingUnitTestCase.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class JBossClient51XSDBindingUnitTestCase extends SchemaBindingValidationTest
+{
+
+ public JBossClient51XSDBindingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void configureLogging()
+ {
+ super.configureLogging();
+ //enableTrace(getClass().getName());
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ // not used in this schema
+ ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "loader-repository-configType"));
+ ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "loader-repositoryType"));
+ ignoreType(new QName(JavaEEMetaDataConstants.JBOSS_NS, "security-roleType"));
+ }
+ public void testJBossClient51() throws Exception
+ {
+ assertEquivalent("jboss-client_5_1.xsd", JBossClient51MetaData.class);
+ }
+}
More information about the jboss-cvs-commits
mailing list