[jboss-svn-commits] JBoss Common SVN: r2480 - in jbossxb-builder/trunk/src: main/java/org/jboss/xb/builder and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 10 09:57:29 EDT 2007
Author: alex.loubyansky at jboss.com
Date: 2007-08-10 09:57:29 -0400 (Fri, 10 Aug 2007)
New Revision: 2480
Added:
jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlNsPrefix.java
Modified:
jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlSchema.java
jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java
jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java
jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionImpl.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/IconImpl.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/IdMetaDataImplWithDescriptions.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NamedMetaDataWithDescriptions.java
jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/ResourceInjectionMetaDataWithDescriptions.java
jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/metadata/test/DescriptionGroupUnitTestCase.java
Log:
added ability to map namespaces to prefixes in the JBossXmlSchema and then bind class properties to elements using prefixes instead of specific namespaces or schema's target.
Added: jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlNsPrefix.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlNsPrefix.java (rev 0)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlNsPrefix.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.xb.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Sometimes, it is desirable to bind a class into different schemas
+ * with different namespaces or bind a class hierarchy into a specific
+ * target namespace and some of the classes into a different namespace
+ * the value of which depends on the root element's namespace.
+ * XmlElement's namespace attribute cannot be used in a case like that.
+ * What we need is to specify a prefix instead of the namespace itself
+ * and define the namespace to prefix mapping in the JBossXmlSchema annotation.
+ *
+ * This annotation is used to reference a namespace by its prefix.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Target({ElementType.FIELD, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface JBossXmlNsPrefix
+{
+ String prefix();
+
+ /**
+ * If the prefix mapping is not found and the value is true
+ * then the target schema namespace will be used, if the value is
+ * false then an exception will be thrown.
+ *
+ * @return
+ */
+ boolean schemaTargetIfNotMapped() default false;
+}
Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlSchema.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlSchema.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/annotations/JBossXmlSchema.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -26,6 +26,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
/**
@@ -47,6 +48,8 @@
/** The attribute form default */
XmlNsForm attributeFormDefault() default XmlNsForm.UNSET;
+ XmlNs[] xmlns() default {};
+
/** Whether to ignore unresolved field and class names, default true */
boolean ignoreUnresolvedFieldOrClass() default true;
Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBBuilder.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -131,6 +131,14 @@
String schemaPackageName = schema.packageName();
if (JBossXmlConstants.DEFAULT.equals(schemaPackageName) == false)
packageName = schemaPackageName;
+
+ if(schema.xmlns().length > 0)
+ {
+ for(int i = 0; i < schema.xmlns().length; ++i)
+ {
+ schemaBinding.addPrefixMapping(schema.xmlns()[i].prefix(), schema.xmlns()[i].namespaceURI());
+ }
+ }
}
// Set the default namespace, if there are none already
Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -74,6 +74,7 @@
import org.jboss.xb.annotations.JBossXmlGroupWildcard;
import org.jboss.xb.annotations.JBossXmlModelGroup;
import org.jboss.xb.annotations.JBossXmlNoElements;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
import org.jboss.xb.annotations.JBossXmlSchema;
import org.jboss.xb.annotations.JBossXmlType;
import org.jboss.xb.binding.SimpleTypeBindings;
@@ -1130,7 +1131,18 @@
PropertyInfo memberProp = propBeanInfo.getProperty(memberPropName);
TypeInfo memberTypeInfo = memberProp.getType();
- String memberNamespace = defaultNamespace;
+ String memberNamespace = null;
+
+ JBossXmlNsPrefix nsPrefix = memberProp.getUnderlyingAnnotation(JBossXmlNsPrefix.class);
+ if(nsPrefix != null)
+ {
+ memberNamespace = schemaBinding.getNamespace(nsPrefix.prefix());
+ if(memberNamespace == null && nsPrefix.schemaTargetIfNotMapped())
+ {
+ throw new IllegalStateException("Prefix '" + nsPrefix.prefix() + "' is not mapped to any namespace!");
+ }
+ }
+
String memberName = null;
XmlElement memberXmlElement = memberProp.getUnderlyingAnnotation(XmlElement.class);
if(memberXmlElement != null)
@@ -1139,10 +1151,17 @@
{
memberTypeInfo = memberTypeInfo.getTypeInfoFactory().getTypeInfo(memberXmlElement.type());
}
- memberNamespace = memberXmlElement.namespace();
+
+ if(memberNamespace == null)
+ memberNamespace = memberXmlElement.namespace();
memberName = memberXmlElement.name();
}
+ if(memberNamespace == null)
+ {
+ memberNamespace = defaultNamespace;
+ }
+
boolean isCol = false;
AbstractPropertyHandler memberPropertyHandler = null;
if(memberTypeInfo.isCollection())
@@ -1194,6 +1213,9 @@
if (elements == null || elements.length == 0)
elements = new XmlElement[1];
+ // for now support just one JBossXmlNsPrefix
+ JBossXmlNsPrefix xmlNsPrefix = property.getUnderlyingAnnotation(JBossXmlNsPrefix.class);
+
// Setup a choice
if (elements.length > 1)
{
@@ -1232,6 +1254,22 @@
if (elementType != XmlElement.DEFAULT.class)
localPropertyType = propertyType.getTypeInfoFactory().getTypeInfo(elementType);
}
+
+ if(xmlNsPrefix != null)
+ {
+ overrideNamespace = schemaBinding.getNamespace(xmlNsPrefix.prefix());
+ if(overrideNamespace == null)
+ {
+ if(xmlNsPrefix.schemaTargetIfNotMapped())
+ {
+ overrideNamespace = defaultNamespace;
+ }
+ else
+ {
+ throw new IllegalStateException("Prefix '" + xmlNsPrefix.prefix() + "' is not mapped to any namespace!");
+ }
+ }
+ }
// Determine the name
QName qName = generateXmlName(property.getName(), elementForm, overrideNamespace, overrideName);
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/jboss/JBoss50MetaData.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -23,13 +23,12 @@
import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
+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.xb.annotations.JBossXmlSchema;
-//import org.jboss.xb.binding.annotations.SchemaTypeImpl;
-//import org.jboss.xb.binding.annotations.SchemaTypeImpls;
/**
* JBoss50MetaData.
@@ -37,11 +36,13 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlRootElement(name="jboss", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
- namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ at XmlRootElement(name="jboss", namespace="http://www.jboss.com/xml/ns/javaee")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="http://www.jboss.com/xml/ns/javaee",
elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jbossType", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at XmlType(name="jbossType", namespace="http://www.jboss.com/xml/ns/javaee")
/*@XmlTypeImpls
({
@XmlTypeImpl(name="true-falseType", startElementCreatesObject=false),
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar21MetaData.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -24,6 +24,7 @@
import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -35,7 +36,9 @@
* @version $Revision: 1.1 $
*/
@XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
namespace="http://java.sun.com/xml/ns/j2ee",
elementFormDefault=XmlNsForm.QUALIFIED)
@XmlType(name="ejb-jarType",
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/ejb/metadata/spec/EjbJar30MetaData.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -24,6 +24,7 @@
import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -35,7 +36,9 @@
* @version $Revision: 1.1 $
*/
@XmlRootElement(name="ejb-jar", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
@XmlType(name="ejb-jarType",
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionGroupMetaData.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -29,6 +29,7 @@
import org.jboss.javaee.annotation.DisplayNames;
import org.jboss.javaee.annotation.Icons;
import org.jboss.xb.annotations.JBossXmlModelGroup;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* DescriptionGroupMetaData.
@@ -77,7 +78,7 @@
* @throws IllegalArgumentException for a null descriptions
*/
@XmlElement(name="description", type=DescriptionsImpl.class)
- //@XmlElement(name="description", type=DescriptionImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setDescriptions(Descriptions descriptions)
{
if (descriptions == null)
@@ -102,6 +103,7 @@
* @throws IllegalArgumentException for a null displayNames
*/
@XmlElement(name="display-name", type=DisplayNamesImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setDisplayNames(DisplayNames displayNames)
{
if (displayNames == null)
@@ -126,6 +128,7 @@
* @throws IllegalArgumentException for a null icons
*/
@XmlElement(name="icon", type=IconsImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setIcons(Icons icons)
{
if (icons == null)
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionImpl.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionImpl.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/DescriptionImpl.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -33,7 +33,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
- at XmlType(name="descriptionType")
+ at XmlType(name="descriptionType", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
public class DescriptionImpl extends LanguageMetaData implements Description
{
/** The serialVersionUID */
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/IconImpl.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/IconImpl.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/spec/IconImpl.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -25,6 +25,7 @@
import org.jboss.javaee.annotation.Icon;
import org.jboss.javaee.metadata.support.LanguageMetaData;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* IconImpl.
@@ -78,6 +79,7 @@
* @param largeIcon the largeIcon.
* @throws IllegalArgumentException for a null largeIcon
*/
+ @JBossXmlNsPrefix(prefix="jee", schemaTargetIfNotMapped=true)
public void setLargeIcon(String largeIcon)
{
if (largeIcon == null)
@@ -101,6 +103,7 @@
* @param smallIcon the smallIcon.
* @throws IllegalArgumentException for a null smallIcon
*/
+ @JBossXmlNsPrefix(prefix="jee", schemaTargetIfNotMapped=true)
public void setSmallIcon(String smallIcon)
{
if (smallIcon == null)
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/IdMetaDataImplWithDescriptions.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/IdMetaDataImplWithDescriptions.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/IdMetaDataImplWithDescriptions.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -25,6 +25,7 @@
import org.jboss.javaee.annotation.Descriptions;
import org.jboss.javaee.metadata.spec.DescriptionsImpl;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* IdMetaDataImplWithDescriptions.
@@ -65,6 +66,7 @@
* @throws IllegalArgumentException for a null descriptions
*/
@XmlElement(name="description", type=DescriptionsImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setDescriptions(Descriptions descriptions)
{
if (descriptions == null)
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NamedMetaDataWithDescriptions.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NamedMetaDataWithDescriptions.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/NamedMetaDataWithDescriptions.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -25,6 +25,7 @@
import org.jboss.javaee.annotation.Descriptions;
import org.jboss.javaee.metadata.spec.DescriptionsImpl;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* NamedMetaData.
@@ -57,6 +58,7 @@
* @throws IllegalArgumentException for a null descriptions
*/
@XmlElement(name="description", type=DescriptionsImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setDescriptions(Descriptions descriptions)
{
if (descriptions == null)
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/ResourceInjectionMetaDataWithDescriptions.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/ResourceInjectionMetaDataWithDescriptions.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/javaee/metadata/support/ResourceInjectionMetaDataWithDescriptions.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -26,6 +26,7 @@
import org.jboss.javaee.annotation.Descriptions;
import org.jboss.javaee.metadata.spec.DescriptionsImpl;
import org.jboss.javaee.metadata.spec.ResourceInjectionMetaData;
+import org.jboss.xb.annotations.JBossXmlNsPrefix;
/**
* ResourceInjectionMetaData.
@@ -58,6 +59,7 @@
* @throws IllegalArgumentException for a null descriptions
*/
@XmlElement(name="description", type=DescriptionsImpl.class)
+ @JBossXmlNsPrefix(prefix="jee")
public void setDescriptions(Descriptions descriptions)
{
if (descriptions == null)
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJar3xEverythingUnitTestCase.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -96,6 +96,11 @@
//enableTrace("org.jboss.xb");
//enableTrace("org.jboss.xb.builder");
EjbJar3xMetaData ejbJarMetaData = unmarshal();
+ assertEverything(ejbJarMetaData);
+ }
+
+ public void assertEverything(EjbJar3xMetaData ejbJarMetaData)
+ {
//ApplicationMetaData applicationMetaData = new ApplicationMetaData(ejbJarMetaData);
assertVersion(ejbJarMetaData);
//assertVersion(applicationMetaData);
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/ejb/metadata/test/JBoss5xEverythingUnitTestCase.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -22,9 +22,6 @@
package org.jboss.test.ejb.metadata.test;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Set;
import junit.framework.Test;
@@ -77,9 +74,9 @@
//import org.jboss.metadata.MessageDrivenMetaData;
//import org.jboss.metadata.SessionMetaData;
import org.jboss.test.ejb.AbstractEJBEverythingTest;
-import org.jboss.test.javaee.metadata.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
/**
* JBoss5xEverythingUnitTestCase.
*
@@ -112,8 +109,13 @@
public void testEverything() throws Exception
{
//enableTrace("org.jboss.xb");
- enableTrace("org.jboss.xb.builder");
- JBoss50MetaData jbossMetaData = unmarshal();
+ //enableTrace("org.jboss.xb.builder");
+ JBoss50MetaData jbossMetaData = unmarshal();
+ assertEverything(jbossMetaData);
+ }
+
+ public void assertEverything(JBoss50MetaData jbossMetaData)
+ {
assertVersion(jbossMetaData);
assertId("jboss", jbossMetaData);
assertDescriptionGroup("jboss", jbossMetaData.getDescriptionGroup());
Modified: jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/metadata/test/DescriptionGroupUnitTestCase.java
===================================================================
--- jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/metadata/test/DescriptionGroupUnitTestCase.java 2007-08-10 13:33:06 UTC (rev 2479)
+++ jbossxb-builder/trunk/src/test/java/org/jboss/test/javaee/metadata/test/DescriptionGroupUnitTestCase.java 2007-08-10 13:57:29 UTC (rev 2480)
@@ -22,6 +22,7 @@
package org.jboss.test.javaee.metadata.test;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -37,6 +38,7 @@
import org.jboss.javaee.metadata.spec.DescriptionImpl;
import org.jboss.javaee.metadata.spec.DisplayNameImpl;
import org.jboss.javaee.metadata.spec.IconImpl;
+import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
import org.jboss.test.javaee.metadata.AbstractJavaEEMetaDataTest;
import org.jboss.xb.annotations.JBossXmlSchema;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -113,8 +115,9 @@
}
@JBossXmlSchema(
+ xmlns={@XmlNs(prefix="jee", namespaceURI=JavaEEMetaDataConstants.JAVAEE_NS)},
ignoreUnresolvedFieldOrClass=false,
- namespace="http://java.sun.com/xml/ns/javaee",
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
//@SchemaElement(name="descriptions")
@XmlRootElement(name="descriptions", namespace="http://java.sun.com/xml/ns/javaee")
More information about the jboss-svn-commits
mailing list