[jboss-cvs] JBossAS SVN: r108731 - in projects/metadata/ejb/branches/infinispan-int/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 21 14:40:06 EDT 2010
Author: smarlow at redhat.com
Date: 2010-10-21 14:40:06 -0400 (Thu, 21 Oct 2010)
New Revision: 108731
Added:
projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBoss60MetaData.java
Modified:
projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_6_0.xsd
projects/metadata/ejb/branches/infinispan-int/src/test/java/org/jboss/metadata/ejb/test/jndibindingpolicy/unit/JNDIBindingPolicyTestCase.java
projects/metadata/ejb/branches/infinispan-int/src/test/resources/schema2class.properties
Log:
JBMETA-303 need to add unit tests still
Added: projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBoss60MetaData.java
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBoss60MetaData.java (rev 0)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBoss60MetaData.java 2010-10-21 18:40:06 UTC (rev 108731)
@@ -0,0 +1,89 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, 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.metadata.ejb.jboss;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * 6.0 jboss.xml metadata
+ *
+ */
+ at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"descriptionGroup", "loaderRepository",
+ "jmxName", "securityDomain", "excludeMissingMethods", "unauthenticatedPrincipal",
+ "jndiBindingPolicy", "jaccContextID", "webservices", "enterpriseBeans", "assemblyDescriptor",
+ "resourceManagers"})
+public class JBoss60MetaData extends JBossMetaData
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1;
+
+ /**
+ * Create a new JBoss60MetaData.
+ */
+ public JBoss60MetaData()
+ {
+ // For serialization
+ }
+
+ @XmlAttribute
+ public void setVersion(String v)
+ {
+ super.setVersion(v);
+ }
+
+ @Override
+ @XmlElementWrapper(name="enterprise-beans")
+ @XmlElements({
+ @XmlElement(name="session", type=JBoss51SessionBeanMetaData.class),
+ @XmlElement(name="message-driven", type=JBoss51MessageDrivenBeanMetaData.class),
+ @XmlElement(name="consumer", type=JBoss51ConsumerBeanMetaData.class),
+ @XmlElement(name="ejb", type=JBoss51GenericBeanMetaData.class),
+ @XmlElement(name="service", type=JBoss51ServiceBeanMetaData.class)
+ })
+ public JBossEnterpriseBeansMetaData getEnterpriseBeans()
+ {
+ return super.getEnterpriseBeans();
+ }
+
+ @Override
+ public void setEnterpriseBeans(JBossEnterpriseBeansMetaData beans)
+ {
+ super.setEnterpriseBeans(beans);
+ }
+}
Property changes on: projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBoss60MetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2010-10-21 18:22:58 UTC (rev 108730)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2010-10-21 18:40:06 UTC (rev 108731)
@@ -167,6 +167,9 @@
setVersion("4.2");
if (dtdPublicId != null && dtdPublicId.contains("5.0"))
setVersion("5.0");
+ if (dtdPublicId != null && dtdPublicId.contains("6.0"))
+ setVersion("6.0");
+
}
/**
* Get the DTD public id if one was seen
Modified: projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_6_0.xsd
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_6_0.xsd 2010-10-21 18:22:58 UTC (rev 108730)
+++ projects/metadata/ejb/branches/infinispan-int/src/main/resources/schema/jboss_6_0.xsd 2010-10-21 18:40:06 UTC (rev 108731)
@@ -65,7 +65,7 @@
</xsd:annotation>
<xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"/>
- <xsd:include schemaLocation="http://www.jboss.org/j2ee/schema/jboss-common_5_1.xsd "/>
+ <xsd:include schemaLocation="http://www.jboss.org/j2ee/schema/jboss-common_6_0.xsd "/>
<!-- **************************************************** -->
Modified: projects/metadata/ejb/branches/infinispan-int/src/test/java/org/jboss/metadata/ejb/test/jndibindingpolicy/unit/JNDIBindingPolicyTestCase.java
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/test/java/org/jboss/metadata/ejb/test/jndibindingpolicy/unit/JNDIBindingPolicyTestCase.java 2010-10-21 18:22:58 UTC (rev 108730)
+++ projects/metadata/ejb/branches/infinispan-int/src/test/java/org/jboss/metadata/ejb/test/jndibindingpolicy/unit/JNDIBindingPolicyTestCase.java 2010-10-21 18:40:06 UTC (rev 108731)
@@ -28,6 +28,7 @@
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBoss51MetaData;
+import org.jboss.metadata.ejb.jboss.JBoss60MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.process.processor.ejb.jboss.JNDIBindingPolicyProcessor;
@@ -62,6 +63,7 @@
schemaBindingResolver = new MultiClassSchemaResolver();
schemaBindingResolver.mapLocationToClass("jboss_5_0.xsd", JBoss50MetaData.class);
schemaBindingResolver.mapLocationToClass("jboss_5_1.xsd", JBoss51MetaData.class);
+ schemaBindingResolver.mapLocationToClass("jboss_6_0.xsd", JBoss60MetaData.class);
}
/**
Modified: projects/metadata/ejb/branches/infinispan-int/src/test/resources/schema2class.properties
===================================================================
--- projects/metadata/ejb/branches/infinispan-int/src/test/resources/schema2class.properties 2010-10-21 18:22:58 UTC (rev 108730)
+++ projects/metadata/ejb/branches/infinispan-int/src/test/resources/schema2class.properties 2010-10-21 18:40:06 UTC (rev 108731)
@@ -14,6 +14,7 @@
jboss_6_0.dtd org.jboss.metadata.ejb.jboss.JBoss60DTDMetaData
jboss_5_0.xsd org.jboss.metadata.ejb.jboss.JBoss50MetaData
jboss_5_1.xsd org.jboss.metadata.ejb.jboss.JBoss51MetaData
+jboss_6_0.xsd org.jboss.metadata.ejb.jboss.JBoss60MetaData
# JPA
persistence_1_0.xsd org.jboss.metadata.jpa.spec.PersistenceMetaData
More information about the jboss-cvs-commits
mailing list