[jboss-cvs] JBossAS SVN: r80371 - in projects/metadata/trunk: src/main/java/org/jboss/metadata and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 3 06:15:28 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-03 06:15:27 -0500 (Mon, 03 Nov 2008)
New Revision: 80371
Modified:
projects/metadata/trunk/pom.xml
projects/metadata/trunk/src/main/java/org/jboss/metadata/IorSecurityConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CurrentMessageMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORSASContextMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORTransportConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LocalBindingMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
Log:
JBMETA-139 most of the fixes (still missing EJB2.x types and elements)
Modified: projects/metadata/trunk/pom.xml
===================================================================
--- projects/metadata/trunk/pom.xml 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/pom.xml 2008-11-03 11:15:27 UTC (rev 80371)
@@ -34,21 +34,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/*TestCase.java</include>
- </includes>
-
- <!--
-
- JBMETA-139
-
- Remove this exclusion when done
-
- http://www.jboss.com/index.html?module=bb&op=viewtopic&t=144854
-
- -->
- <excludes>
- <exclude>**/SchemaBindingValidationUnitTestCase.java</exclude>
- </excludes>
-
+ </includes>
</configuration>
</plugin>
</plugins>
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/IorSecurityConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/IorSecurityConfigMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/IorSecurityConfigMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -442,7 +442,6 @@
* sas-context (related to CSIv2 security attribute service) element describes
* the sas-context fields.
*/
- @XmlType(name="sas-context-type")
public class SasContext
{
public static final String CALLER_PROPAGATION_NONE = "NONE";
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/ClusterConfigMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -31,7 +31,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="cluster-configType")
+ at XmlType(name="cluster-configType", propOrder={"descriptions", "partitionName", "homeLoadBalancePolicy", "beanLoadBalancePolicy",
+ "loadBalancePolicy", "sessionStateManagerJndiName"})
public class ClusterConfigMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CurrentMessageMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CurrentMessageMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/CurrentMessageMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -21,6 +21,8 @@
*/
package org.jboss.metadata.ejb.jboss;
+import javax.xml.bind.annotation.XmlType;
+
import org.jboss.metadata.ejb.spec.MethodsMetaData;
/**
@@ -28,6 +30,7 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version <tt>$Revision$</tt>
*/
+ at XmlType(name="current-messageType")
public class CurrentMessageMetaData extends MethodsMetaData
{
private static final long serialVersionUID = 1L;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORSASContextMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORSASContextMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORSASContextMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -32,7 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="sas-contextType")
+ at XmlType(name="sas-contextType", propOrder={"descriptions", "callerPropagation"})
public class IORSASContextMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORTransportConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORTransportConfigMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/IORTransportConfigMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -32,7 +32,8 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="transport-configType")
+ at XmlType(name="transport-configType", propOrder={"descriptions", "integrity", "confidentiality", "establishTrustInTarget",
+ "establishTrustInClient", "detectMisordering", "detectReplay"})
public class IORTransportConfigMetaData extends IdMetaDataImplWithDescriptions
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossConsumerBeanMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -37,7 +37,10 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version <tt>$Revision$</tt>
*/
- at XmlType(name="consumer-beanType")
+ at XmlType(name="consumer-beanType", propOrder={"descriptionGroup", "ejbName", "ejbClass", "messageDestination",
+ "messageDestinationType", "producers", "localProducers", "currentMessage", "messageProperties", "mappedName",
+ "localJndiName", "jndiBindingPolicy", "jndiEnvironmentRefsGroup", "securityDomain", "methodAttributes", "depends",
+ "annotations", "ignoreDependency", "aopDomainName", "poolConfig", "jndiRefs", "activationConfig", "defaultActivationConfig"})
public class JBossConsumerBeanMetaData extends JBossEnterpriseBeanMetaData
{
private static final long serialVersionUID = 1L;
@@ -156,6 +159,13 @@
}
@Override
+ @XmlElement(name="jndi-name")
+ public String getMappedName()
+ {
+ return super.getMappedName();
+ }
+
+ @Override
public boolean isConsumer()
{
return true;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -40,7 +40,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="jboss-enterprise-beansType")
+ at XmlType(name="enterprise-beansType")
public class JBossEnterpriseBeansMetaData
extends EnterpriseBeansMap<JBossAssemblyDescriptorMetaData, JBossEnterpriseBeansMetaData, JBossEnterpriseBeanMetaData, JBossMetaData>
{
@@ -105,6 +105,12 @@
jbossMetaData = ejbJarMetaData;
}
+ @XmlTransient
+ public boolean isEmpty()
+ {
+ return super.isEmpty();
+ }
+
@Override
public void merge(IdMetaData override, IdMetaData original)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -30,7 +30,8 @@
* @version $Revision$
*/
@XmlType(name="service-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "businessLocals", "businessRemotes",
- "ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "remoteBindings",
+ "ejbClass", "jndiEnvironmentRefsGroup", "securityIdentity", "objectName", "management", "xmbean", "localBindings",
+ "remoteBindings",
"jndiName", "localJndiName", "jndiBindingPolicy", "securityDomain", "methodAttributes", "depends", "annotations",
"ignoreDependency", "aopDomainName", "jndiRefs"})
public class JBossServiceBeanMetaData extends JBossSessionBeanMetaData
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -49,7 +49,8 @@
* @version $Revision$
*/
@XmlType(name="session-beanType", propOrder={"descriptionGroup", "ejbName", "mappedName", "jndiEnvironmentRefsGroup",
- "securityIdentity", "remoteBindings", "businessLocals", "businessRemotes", "jndiName", "homeJndiName", "callByValue",
+ "securityIdentity", "localBindings", "remoteBindings", "businessLocals", "businessRemotes",
+ "jndiName", "homeJndiName", "callByValue",
"exceptionOnRollback", "timerPersistence", "configurationName", "invokerBindings", "securityProxy", "localJndiName",
"localHomeJndiName", "jndiBindingPolicy", "clustered",
"clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LocalBindingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LocalBindingMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/LocalBindingMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -31,7 +31,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
- at XmlType(name="local-bindingType")
+ at XmlType(name="local-bindingType", propOrder={"descriptions", "jndiName"})
public class LocalBindingMetaData extends IdMetaDataImplWithDescriptions
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/PoolConfigMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ejb.jboss;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -31,6 +32,7 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version <tt>$Revision$</tt>
*/
+ at XmlType(name="pool-configType", propOrder={"value", "maxSize", "timeout"})
public class PoolConfigMetaData
{
private String value = null;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -23,6 +23,7 @@
// $Id$
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -33,6 +34,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at XmlType(name="stub-propertyType", propOrder={"propName", "propValue"})
public class StubPropertyMetaData extends ParamValueMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PortComponent.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -33,7 +33,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="port-componentType")
+ at XmlType(name="port-componentType", propOrder={"portComponentName", "portComponentURI", "authMethod", "transportGuarantee", "secureWSDLAccess"})
public class PortComponent extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-11-03 11:15:27 UTC (rev 80371)
@@ -768,13 +768,14 @@
</xsd:annotation>
<xsd:sequence>
+ <xsd:group ref="jboss:descriptionGroup"/>
<xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
<xsd:element name="ejb-class" type="javaee:ejb-classType"/>
<xsd:element name="message-destination" type="jboss:consumer-message-destinationType"/>
<xsd:element name="message-destination-type" type="javaee:message-destination-typeType"/>
<xsd:element name="producer" type="jboss:producerType" maxOccurs="unbounded"/>
<xsd:element name="local-producer" type="jboss:producerType" maxOccurs="unbounded"/>
- <xsd:element name="current-message" type="jboss:current-messageType"/>
+ <xsd:element name="current-message" type="jboss:method-attributesType"/>
<xsd:element name="message-properties" type="jboss:message-propertiesType"
maxOccurs="unbounded"/>
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
@@ -799,6 +800,7 @@
<xsd:element name="aop-domain-name" type="jboss:aop-domain-nameType" minOccurs="0"/>
<xsd:element name="pool-config" type="jboss:pool-configType" minOccurs="0"/>
<xsd:element name="jndi-ref" type="jboss:jndi-refType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="activation-config" type="jboss:activation-configType" minOccurs="0"/>
<xsd:element name="default-activation-config" type="jboss:activation-configType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
@@ -854,7 +856,7 @@
<xsd:element name="local-binding" type="jboss:local-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="remote-binding" type="jboss:remote-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- <xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
+ <xsd:element name="local-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="security-domain" type="javaee:xsdStringType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
@@ -906,8 +908,8 @@
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
- <!-- **************************************************** -->
-
+ <!-- ****************************************************
+ not bound in metadata api
<xsd:complexType name="current-messageType">
<xsd:annotation>
<xsd:documentation> Element for defining the method used as the injection point for the
@@ -919,6 +921,7 @@
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
+ -->
<!-- **************************************************** -->
@@ -1080,6 +1083,23 @@
<!-- **************************************************** -->
+ <xsd:complexType name="local-bindingType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ Element for specifying the local jndi binding for a bean.
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <!-- **************************************************** -->
+
<xsd:complexType name="concurrentType">
<xsd:annotation>
<xsd:documentation> Set on a stateful bean. Instead of throwing an exception on concurrent access to the stateful bean,
@@ -1315,18 +1335,7 @@
</xsd:simpleContent>
</xsd:complexType>
- <!-- **************************************************** -->
- <xsd:complexType name="local-bindingType">
- <xsd:annotation>
- <xsd:documentation>Element for specifying the local jndi binding for a bean.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
<!-- **************************************************** -->
<xsd:complexType name="remote-bindingType">
@@ -1546,6 +1555,7 @@
<xsd:element name="port-component-uri" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="auth-method" type="xsd:string" minOccurs="0" maxOccurs="1"/>
<xsd:element name="transport-guarantee" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
@@ -1658,7 +1668,7 @@
<xsd:complexType name="ior-security-configType">
<xsd:sequence>
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="transport-config" type="jboss:transport-config-type" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="transport-config" type="jboss:transport-configType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="as-context" type="jboss:as-contextType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="sas-context" type="jboss:sas-contextType" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
@@ -1667,8 +1677,9 @@
<!--
transport-config is the root element for security between the end points
-->
- <xsd:complexType name="transport-config-type">
+ <xsd:complexType name="transport-configType">
<xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="integrity" type="xsd:string"/>
<xsd:element name="confidentiality" type="xsd:string"/>
<xsd:element name="establish-trust-in-target" type="xsd:string"/>
@@ -1772,12 +1783,14 @@
</xsd:annotation>
<xsd:sequence>
+ <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="partition-name" type="jboss:partition-nameType" minOccurs="0"/>
<xsd:element name="home-load-balance-policy" type="jboss:load-balance-policyType" minOccurs="0"/>
<xsd:choice>
<xsd:element name="bean-load-balance-policy" type="jboss:bean-load-balance-policyType" minOccurs="0"/>
<xsd:element name="load-balance-policy" type="jboss:load-balance-policyType" minOccurs="0"/>
</xsd:choice>
+ <xsd:element name="session-state-manager-jndi-name" type="javaee:string" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java 2008-11-03 11:13:26 UTC (rev 80370)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java 2008-11-03 11:15:27 UTC (rev 80371)
@@ -88,6 +88,9 @@
IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "jbossType"));
// the issue with the subset of the jndi env reference group
IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "message-driven-beanType"));
+ IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "consumer-beanType"));
+ // entity type is missing
+ IGNORED_TYPES.add(new QName(JavaEEMetaDataConstants.JBOSS_NS, "enterprise-beansType"));
}
private static final Set<String> IGNORED_NS;
@@ -95,6 +98,7 @@
{
IGNORED_NS = new HashSet<String>();
IGNORED_NS.add(Constants.NS_XML_SCHEMA);
+ IGNORED_NS.add(JavaEEMetaDataConstants.JAVAEE_NS);
}
private static final QName WILDCARD = new QName("wildcard", "wildcard");
@@ -169,7 +173,7 @@
for (int i = 0; i < types.getLength(); ++i)
{
XSTypeDefinition xsType = (XSTypeDefinition) types.item(i);
- if (Constants.NS_XML_SCHEMA.equals(xsType.getNamespace()))
+ if (IGNORED_NS.contains(xsType.getNamespace()))
continue;
QName typeQName = new QName(xsType.getNamespace(), xsType.getName());
@@ -209,7 +213,8 @@
for (Iterator<TypeBinding> iter = schemaBinding.getTypes(); iter.hasNext();)
{
TypeBinding type = iter.next();
- log.trace("- " + type.getQName());
+ if(!IGNORED_NS.contains(type.getQName().getNamespaceURI()))
+ log.trace("- " + type.getQName());
}
}
fail("Type " + typeQName + " defined in schema binding.");
@@ -225,6 +230,8 @@
for (int i = 0; i < elements.getLength(); ++i)
{
XSElementDeclaration xsElement = (XSElementDeclaration) elements.item(i);
+ if (IGNORED_NS.contains(xsElement.getNamespace()))
+ continue;
QName elementQName = new QName(xsElement.getNamespace(), xsElement.getName());
ElementBinding elementBinding = schemaBinding.getElement(elementQName);
assertNotNull("ElementBinding " + elementQName + " exists", elementBinding);
@@ -428,6 +435,19 @@
{
if(trace)
log.trace("choice");
+
+ if(modelGroupBinding instanceof SequenceBinding)
+ {
+ // another chance...
+ Collection<ParticleBinding> particles = modelGroupBinding.getParticles();
+ if(particles.size() == 1)
+ {
+ ParticleBinding particleBinding = particles.iterator().next();
+ if(particleBinding.getTerm() instanceof ChoiceBinding)
+ modelGroupBinding = (ModelGroupBinding) particleBinding.getTerm();
+ }
+ }
+
assertTrue("ModelGroupBinding expected to be a choice but was " + modelGroupBinding, modelGroupBinding instanceof ChoiceBinding);
}
else if(xsCompositor == XSModelGroup.COMPOSITOR_ALL)
More information about the jboss-cvs-commits
mailing list