[jboss-cvs] JBossAS SVN: r88255 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/client and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 6 08:38:35 EDT 2009
Author: alex.loubyansky at jboss.com
Date: 2009-05-06 08:38:34 -0400 (Wed, 06 May 2009)
New Revision: 88255
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar11UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeActivationConfigUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta119/unit/LocalBindingsUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta133/unit/DefaultClusterConfigUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta154/unit/MergeBeanDefinitionsTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta42/unit/Default2xNamingStrategyTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta56/unit/EnvironmentTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta66/unit/GenericBeanWithHomeTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50NegativeUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp24UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
Log:
JBMETA-192
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ConsumerBeanMetaData.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,14 +21,8 @@
*/
package org.jboss.metadata.ejb.jboss;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
/**
* An EJB 3 consumer bean.
@@ -41,260 +35,7 @@
"messageDestinationType", "producers", "localProducers", "currentMessage", "messageProperties",
"environmentRefsGroup", "securityDomain", "methodAttributes", "depends",
"annotations", "ignoreDependency", "aopDomainName", "poolConfig", "jndiRefs", "activationConfig"})
-public class JBoss51ConsumerBeanMetaData extends JBossEnterpriseBeanMetaData
+public class JBoss51ConsumerBeanMetaData extends JBossConsumerBeanMetaData
{
private static final long serialVersionUID = 1L;
-
- @SuppressWarnings("unused")
- private static final Logger log = Logger.getLogger(JBoss51ConsumerBeanMetaData.class);
-
- /** The activation config */
- private ActivationConfigMetaData activationConfig;
-
- /** The destiation. */
- private String destination = null;
-
- /** The destination type. */
- private String destinationType = null;
-
- /** The current message. */
- private MethodAttributesMetaData currentMessage = null;
-
- /** The message properties. */
- private List<MessagePropertiesMetaData> messageProperties = null;
-
- /** The producers. */
- private List<ProducerMetaData> producers = null;
-
- /** The local producers. */
- private List<LocalProducerMetaData> localProducers = null;
-
- /** The default activation config. */
- private ActivationConfigMetaData defaultActivationConfig;
-
- public ActivationConfigMetaData getActivationConfig()
- {
- return activationConfig;
- }
-
- public void setActivationConfig(ActivationConfigMetaData activationConfig)
- {
- if (activationConfig == null)
- throw new IllegalArgumentException("Null activationConfig");
- this.activationConfig = activationConfig;
- }
-
- public String getMessageDestination()
- {
- return destination;
- }
-
- public void setMessageDestination(String destination)
- {
- this.destination = destination;
- }
-
- public String getMessageDestinationType()
- {
- return destinationType;
- }
-
- public void setMessageDestinationType(String destinationType)
- {
- this.destinationType = destinationType;
- }
-
- public MethodAttributesMetaData getCurrentMessage()
- {
- return currentMessage;
- }
-
- public void setCurrentMessage(MethodAttributesMetaData currentMessage)
- {
- this.currentMessage = currentMessage;
- }
-
- public List<MessagePropertiesMetaData> getMessageProperties()
- {
- return messageProperties;
- }
-
- public void setMessageProperties(List<MessagePropertiesMetaData> messageProperties)
- {
- this.messageProperties = messageProperties;
- }
-
- public List<ProducerMetaData> getProducers()
- {
- return producers;
- }
-
- @XmlElement(name="producer", required=false)
- public void setProducers(List<ProducerMetaData> producers)
- {
- this.producers = producers;
- }
-
- public List<LocalProducerMetaData> getLocalProducers()
- {
- return localProducers;
- }
-
- @XmlElement(name="local-producer", required=false)
- public void setLocalProducers(List<LocalProducerMetaData> producers)
- {
- this.localProducers = producers;
- }
-
- public ActivationConfigMetaData getDefaultActivationConfig()
- {
- return defaultActivationConfig;
- }
-
- public void setDefaultActivationConfig(ActivationConfigMetaData defaultActivationConfig)
- {
- if (defaultActivationConfig == null)
- throw new IllegalArgumentException("Null defaultActivationConfig");
- this.defaultActivationConfig = defaultActivationConfig;
- }
-
- @Override
- @XmlElement(name="jndi-name")
- public String getMappedName()
- {
- return super.getMappedName();
- }
-
- @Override
- public boolean isConsumer()
- {
- return true;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[Consumer:");
- sb.append(super.toString());
- sb.append(", destination=" + destination);
- sb.append(", destinationType=" + destinationType);
- sb.append(']');
- return sb.toString();
- }
-
- @Override
- public String getDefaultConfigurationName()
- {
- throw new RuntimeException("NYI");
- }
-
- @Override
- protected String getDefaultInvokerName()
- {
- throw new RuntimeException("NYI");
- }
-
- /**
- * @deprecated JBMTEA-68
- */
- @Override
- @Deprecated
- public String determineJndiName()
- {
- return null;
- }
-
- public void merge(JBossEnterpriseBeanMetaData overrideEjb, JBossEnterpriseBeanMetaData originalEjb)
- {
- super.merge(overrideEjb, originalEjb);
-
- List<ProducerMetaData> originalProducers = null;
- List<LocalProducerMetaData> originalLocalProducers = null;
- List<MessagePropertiesMetaData> originalMsgProps = null;
- MethodAttributesMetaData originalMsg = null;
- JBoss51ConsumerBeanMetaData original = originalEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ConsumerBeanMetaData) originalEjb;
- if(original != null)
- {
- if(original.destination != null)
- destination = original.destination;
- if(original.destinationType != null)
- destinationType = original.destinationType;
-
- originalMsg = original.currentMessage;
- originalMsgProps = original.messageProperties;
- originalProducers = original.producers;
- originalLocalProducers = original.localProducers;
- }
-
- List<ProducerMetaData> overrideProducers = null;
- List<LocalProducerMetaData> overrideLocalProducers = null;
- List<MessagePropertiesMetaData> overrideMsgProps = null;
- MethodAttributesMetaData overrideMsg = null;
- JBoss51ConsumerBeanMetaData override = overrideEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ConsumerBeanMetaData) overrideEjb;
- if(override != null)
- {
- if(override.destination != null)
- destination = override.destination;
- if(override.destinationType != null)
- destinationType = override.destinationType;
-
- overrideMsg = override.currentMessage;
- overrideMsg = override.currentMessage;
- overrideMsgProps = override.messageProperties;
- overrideProducers = override.producers;
- overrideLocalProducers = override.localProducers;
- }
-
- if((override != null && override.activationConfig != null) || (original != null && original.activationConfig != null))
- {
- activationConfig = new ActivationConfigMetaData();
- activationConfig.merge(override != null ? override.activationConfig : null, original != null ? original.activationConfig : null);
- }
-
- if(originalMsg != null || overrideMsg != null)
- {
- if(currentMessage == null)
- currentMessage = new MethodAttributesMetaData();
- currentMessage.merge(overrideMsg, originalMsg);
- }
-
- if(overrideMsgProps != null)
- {
- if(messageProperties == null)
- messageProperties = new ArrayList<MessagePropertiesMetaData>();
- messageProperties.addAll(overrideMsgProps);
- }
- if(originalMsgProps != null)
- {
- if(messageProperties == null)
- messageProperties = new ArrayList<MessagePropertiesMetaData>();
- messageProperties.addAll(originalMsgProps);
- }
-
- if(overrideProducers != null)
- {
- if(producers == null)
- producers = new ArrayList<ProducerMetaData>();
- producers.addAll(overrideProducers);
- }
- if(originalProducers != null)
- {
- if(producers == null)
- producers = new ArrayList<ProducerMetaData>();
- producers.addAll(originalProducers);
- }
-
- if(overrideLocalProducers != null)
- {
- if(localProducers == null)
- localProducers = new ArrayList<LocalProducerMetaData>();
- localProducers.addAll(overrideLocalProducers);
- }
- if(originalLocalProducers != null)
- {
- if(localProducers == null)
- localProducers = new ArrayList<LocalProducerMetaData>();
- localProducers.addAll(originalLocalProducers);
- }
- }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51GenericBeanMetaData.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -23,7 +23,6 @@
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.spec.PortComponent;
/**
* Allow for the specification of an unknown bean type in the deployment
@@ -36,115 +35,7 @@
"securityIdentity", "jndiName", "homeJndiName", "localJndiName", "localHomeJndiName",
"jndiBindingPolicy", "securityDomain", "methodAttributes", "depends", "annotations", "ignoreDependency", "aopDomainName",
"poolConfig", "jndiRefs", "portComponent"})
-public class JBoss51GenericBeanMetaData extends JBossEnterpriseBeanMetaData
+public class JBoss51GenericBeanMetaData extends JBossGenericBeanMetaData
{
private static final long serialVersionUID = 1L;
-
- /** The jndi name for the EJB 2 remote home interface */
- private String homeJndiName;
-
- /** The jndi name for the EJB 2 local home interface */
- private String localHomeJndiName;
-
- /** The webservices port-component */
- private PortComponent portComponent;
-
- /* (non-Javadoc)
- * @see org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData#getDefaultConfigurationName()
- */
- @Override
- public String getDefaultConfigurationName()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData#getDefaultInvokerName()
- */
- @Override
- protected String getDefaultInvokerName()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * @deprecated JBMETA-68
- */
- @Override
- @Deprecated
- public String determineJndiName()
- {
- return getJndiName();
- }
-
- public String getHomeJndiName()
- {
- return homeJndiName;
- }
-
- public void setHomeJndiName(String s)
- {
- this.homeJndiName = s;
- }
-
- /**
- * Get the jndiName.
- *
- * @return the jndiName.
- */
- public String getJndiName()
- {
- return super.getMappedName();
- }
-
- /**
- * Set the jndiName.
- *
- * @param jndiName the jndiName.
- * @throws IllegalArgumentException for a null jndiName
- */
- public void setJndiName(String jndiName)
- {
- super.setMappedName(jndiName);
- }
-
- public String getLocalHomeJndiName()
- {
- return localHomeJndiName;
- }
-
- public void setLocalHomeJndiName(String s)
- {
- this.localHomeJndiName = s;
- }
-
- public PortComponent getPortComponent()
- {
- return portComponent;
- }
-
- public void setPortComponent(PortComponent portComponent)
- {
- this.portComponent = portComponent;
- }
-
- @Override
- public boolean isGeneric()
- {
- return true;
- }
-
- /**
- * Don't call this method.
- *
- * During a merge on JBossEnterpriseBeansMetaData it will translate a JBossGenericBeanMetaData
- * into the proper wrapper.
- */
- @Override
- public void merge(JBossEnterpriseBeanMetaData override, JBossEnterpriseBeanMetaData original)
- {
- throw new RuntimeException("Merging two JBossGenericBeanMetaData objects is not supported, JBossEnterpriseBeansMetaData should have converted them");
- }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBoss51ServiceBeanMetaData.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -34,106 +34,7 @@
"remoteBindings", "jndiName", "homeJndiName", "localJndiName",
"jndiBindingPolicy", "clustered", "clusterConfig", "securityDomain", "methodAttributes", "depends", "annotations",
"ignoreDependency", "aopDomainName", "poolConfig", "concurrent", "jndiRefs", "portComponent", "ejbTimeoutIdentity"})
-public class JBoss51ServiceBeanMetaData extends JBossSessionBeanMetaData
+public class JBoss51ServiceBeanMetaData extends JBossServiceBeanMetaData
{
private static final long serialVersionUID = 1L;
-
- /** The jndi name where the local proxy is bound */
- private String localJndiName;
-
- /** The fully qualified class name for the JMX Management interface */
- private String management;
-
- /** The object name under which the management interface is registered into JMX */
- private String objectName;
-
- /** The resource url for xmbean metadata */
- private String xmBean;
-
- public String getLocalJndiName()
- {
- return localJndiName;
- }
-
- public String getManagement()
- {
- return management;
- }
-
- public String getObjectName()
- {
- return objectName;
- }
-
- public String getXmbean()
- {
- return xmBean;
- }
-
- @Override
- public boolean isService()
- {
- return true;
- }
-
- /**
- * Although a service bean shares the same metadata
- * as a session bean, it's not trully a session bean.
- */
- @Override
- public boolean isSession()
- {
- return false;
- }
-
- public void setLocalJndiName(String localJndiName)
- {
- this.localJndiName = localJndiName;
- }
-
- public void setManagement(String management)
- {
- this.management = management;
- }
-
- public void setObjectName(String objectName)
- {
- this.objectName = objectName;
- }
-
- public void setXmbean(String xmBean)
- {
- this.xmBean = xmBean;
- }
-
- public void merge(JBossEnterpriseBeanMetaData overrideEjb, JBossEnterpriseBeanMetaData originalEjb)
- {
- super.merge(overrideEjb, originalEjb);
- JBoss51ServiceBeanMetaData override = overrideEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ServiceBeanMetaData) overrideEjb;
- JBoss51ServiceBeanMetaData original = originalEjb instanceof JBossGenericBeanMetaData ? null : (JBoss51ServiceBeanMetaData) originalEjb;
-
- if(original != null)
- {
- if(original.localJndiName != null)
- localJndiName = original.localJndiName;
- if(original.management != null)
- management = original.management;
- if(original.objectName != null)
- objectName = original.objectName;
- if(original.xmBean != null)
- xmBean = original.xmBean;
- }
-
- if(override != null)
- {
- if(override.localJndiName != null)
- localJndiName = override.localJndiName;
- if (override.management != null)
- management = override.management;
- if (override.objectName != null)
- objectName = override.objectName;
- if (override.xmBean != null)
- xmBean = override.xmBean;
- }
- }
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/client/AnnotationClientUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -45,12 +45,9 @@
import org.jboss.metadata.annotation.creator.client.ApplicationClient5MetaDataCreator;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
-import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
import org.jboss.metadata.client.jboss.JBossClient5MetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.client.spec.AnnotationMergedView;
-import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
import org.jboss.metadata.javaee.jboss.JBossServiceReferencesMetaData;
@@ -73,8 +70,6 @@
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.omg.CORBA.ORB;
/**
@@ -86,19 +81,6 @@
public class AnnotationClientUnitTestCase extends AbstractJavaEEMetaDataTest
{
private static final String classMainName = "org.jboss.test.metadata.annotation.client.basic.Client";
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
- resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
- resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
- resolver.addClassBindingForLocation("jboss-client_5_0.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
- resolver.addClassBindingForLocation("jboss-client", JBossClient5DTDMetaData.class);
- return resolver;
- }
public AnnotationClientUnitTestCase(String name)
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -45,7 +45,6 @@
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
@@ -59,8 +58,6 @@
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -112,8 +109,6 @@
import org.jboss.test.metadata.ejb.EjbJar3xEverythingUnitTestCase;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest.Mode;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* This tests the annotation translation framework.
@@ -124,24 +119,6 @@
*/
public class AnnotationEjb3UnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
/**
* @param name
*/
@@ -412,7 +389,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = loadClassesFromCurrentClassDir();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
//enableTrace("org.jboss.metadata.annotation.creator");
EjbJar30Creator creator = new EjbJar30Creator(finder);
@@ -426,10 +403,10 @@
assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
// There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
- for (ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
- {
- System.out.println(transaction);
- }
+ //for (ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
+ //{
+ // System.out.println(transaction);
+ //}
assertEquals(6, metaData.getEnterpriseBeans().size());
@@ -441,7 +418,7 @@
AssemblyDescriptorMetaData assembly = metaData.getAssemblyDescriptor();
assertNotNull("no application exceptions defined", assembly.getApplicationExceptions());
assertEquals(1, assembly.getApplicationExceptions().size());
- System.out.println(assembly.getContainerTransactionsByEjbName("MyStatelessBean"));
+ //System.out.println(assembly.getContainerTransactionsByEjbName("MyStatelessBean"));
// @DeclareRoles
SecurityRolesMetaData securityRoles = assembly.getSecurityRoles();
@@ -626,7 +603,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = PackageScanner.loadClasses();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
//enableTrace("org.jboss.metadata.annotation.creator");
EjbJar30Creator creator = new EjbJar30Creator(finder);
@@ -705,7 +682,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = PackageScanner.loadClasses();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
EjbJar30Creator creator = new EjbJar30Creator(finder);
@@ -750,7 +727,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = PackageScanner.loadClasses();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
EjbJar30Creator creator = new EjbJar30Creator(finder);
@@ -773,7 +750,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = PackageScanner.loadClasses();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
EjbJar30Creator creator = new EjbJar30Creator(finder);
@@ -794,7 +771,7 @@
AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
Collection<Class<?>> classes = PackageScanner.loadClasses();
- System.out.println("Processing classes: " + classes);
+ //System.out.println("Processing classes: " + classes);
EjbJar30Creator creator = new EjbJar30Creator(finder);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -49,7 +49,6 @@
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossConsumerBeanMetaData;
@@ -68,9 +67,6 @@
import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
@@ -117,8 +113,6 @@
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.common.SetHelper;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -132,24 +126,6 @@
*/
public class JBossAnnotationEjb3UnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public JBossAnnotationEjb3UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/runas/RunAsUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -29,13 +29,9 @@
import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.AnnotationMergedView;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
@@ -44,8 +40,6 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author Scott.Stark at jboss.org
@@ -55,24 +49,6 @@
{
private static BasicMetaDataRepository repository = new BasicMetaDataRepository();
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public RunAsUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta98/OverrideRemoveMethodUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -39,8 +39,6 @@
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -48,17 +46,6 @@
*/
public class OverrideRemoveMethodUnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public OverrideRemoveMethodUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -36,7 +36,6 @@
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.CacheConfigMetaData;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -50,9 +49,6 @@
import org.jboss.metadata.ejb.spec.AroundInvokeMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
@@ -82,8 +78,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -94,24 +88,6 @@
*/
public class PostXmlProcessingUnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public PostXmlProcessingUnitTestCase(String name)
{
super(name);
@@ -141,10 +117,10 @@
assertNotNull("no container transactions", metaData.getAssemblyDescriptor().getContainerTransactions());
// There is a bug in IdMetaDataImpl.hashCode which isn't unique when id is not set.
- for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
- {
- System.out.println(transaction);
- }
+ //for(ContainerTransactionMetaData transaction : metaData.getAssemblyDescriptor().getContainerTransactions())
+ //{
+ // System.out.println(transaction);
+ //}
assertEquals(6, metaData.getEnterpriseBeans().size());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/web/AnnotationWebUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -67,7 +67,6 @@
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
-import org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.AnnotationMergedView;
@@ -78,8 +77,6 @@
import org.jboss.test.metadata.annotation.ws.TestEndpoint;
import org.jboss.test.metadata.annotation.ws.TestEndpointService;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* This tests the annotation translation framework.
@@ -98,14 +95,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("web-app_2_5.xsd", Web25MetaData.class);
- resolver.addClassBindingForLocation("jboss-web_5_0.dtd", JBoss50DTDWebMetaData.class);
- return resolver;
- }
-
private void assertEnv(EnvironmentRefsGroupMetaData env) throws Exception
{
// @EJB
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -88,11 +88,6 @@
assertNull(targets);
}
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(ApplicationClient14MetaData.class);
- }
-
public void testEverything() throws Exception
{
ApplicationClient14MetaData appClientMetaData = unmarshal();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -22,31 +22,22 @@
package org.jboss.test.metadata.client;
import java.util.List;
-import java.util.Set;
import javax.xml.namespace.QName;
-import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
import org.jboss.metadata.javaee.jboss.JBossPortComponentRef;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
-import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
import org.jboss.metadata.javaee.spec.PortComponentRef;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
-import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of an application client 1.4 descriptor.
@@ -62,15 +53,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
- resolver.addClassBindingForLocation("jboss-client_4_0.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_4_2.dtd", JBossClient5DTDMetaData.class);
- return resolver;
- }
-
public void testBasic() throws Exception
{
ApplicationClientMetaData appClientMetaData = unmarshal();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,15 +21,11 @@
*/
package org.jboss.test.metadata.client;
-import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of an application client 5 descriptor.
@@ -65,16 +61,6 @@
count++;
}
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
- resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
- resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
- return resolver;
- }
public void testEverything() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -23,21 +23,13 @@
import java.util.List;
-import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
-import org.jboss.metadata.client.jboss.JBossClient5MetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.jboss.JBossPortComponentRef;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.PortComponentRef;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest.Mode;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Tests of an application client 5 descriptor.
@@ -52,18 +44,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
- resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
- resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
- resolver.addClassBindingForLocation("jboss-client", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
- return resolver;
- }
-
public void test4915()
throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,18 +21,11 @@
*/
package org.jboss.test.metadata.client;
-import org.jboss.metadata.client.jboss.JBossClient5DTDMetaData;
-import org.jboss.metadata.client.jboss.JBossClient5MetaData;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData;
-import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
-import org.jboss.metadata.client.spec.ApplicationClient5MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of an JBoss specific application client descriptor.
@@ -60,21 +53,6 @@
count++;
}
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-
- resolver.addClassBindingForLocation("application-client_1_3.dtd", ApplicationClient14DTDMetaData.class);
- resolver.addClassBindingForLocation("application-client_1_4.xsd", ApplicationClient14MetaData.class);
- resolver.addClassBindingForLocation("application-client_5.xsd", ApplicationClient5MetaData.class);
- resolver.addClassBindingForLocation("jboss-client_3_2.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_4_0.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_4_2.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_5_0.dtd", JBossClient5DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
- return resolver;
- }
public void testAppClient5Everything() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/JBossClient5EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -26,8 +26,6 @@
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
import org.jboss.test.metadata.javaee.JBossXBTestDelegate;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of an JBoss client 5 descriptor.
@@ -60,17 +58,7 @@
count++;
}
}
-
- public static SchemaBindingResolver initResolver()
- {
- //return schemaResolverForClass(JBossClient5MetaData.class);
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss-client_5_0.xsd", JBossClient5MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBossClient5MetaData.class);
- return resolver;
- }
-
+
public void testEverything() throws Exception
{
JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -33,11 +33,7 @@
import org.jboss.annotation.javaee.DisplayNames;
import org.jboss.annotation.javaee.Icon;
import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
-import org.jboss.metadata.ear.spec.Ear14MetaData;
import org.jboss.metadata.ear.spec.EarMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
@@ -50,8 +46,6 @@
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Ear4x tests
@@ -66,21 +60,6 @@
return suite(Ear4xUnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("application", Ear13DTDMetaData.class);
- resolver.addClassBindingForLocation("application_1_2.dtd", Ear13DTDMetaData.class);
- resolver.addClassBindingForLocation("application_1_3.dtd", Ear13DTDMetaData.class);
- resolver.addClassBindingForLocation("application_1_4.xsd", Ear14MetaData.class);
- resolver.addClassBindingForLocation("jboss-app_3_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.xsd", JBoss50AppMetaData.class);
- return resolver;
- }
-
public Ear4xUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -22,8 +22,6 @@
package org.jboss.test.metadata.ear;
-import java.util.List;
-
import junit.framework.Test;
import org.jboss.annotation.javaee.Description;
@@ -47,7 +45,6 @@
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Ear5x tests
@@ -62,11 +59,6 @@
return suite(Ear5xEverythingUnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(Ear50MetaData.class);
- }
-
public Ear5xEverythingUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -32,7 +32,6 @@
import org.jboss.annotation.javaee.Icons;
import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
@@ -40,7 +39,6 @@
import org.jboss.metadata.javaee.spec.DisplayNameImpl;
import org.jboss.metadata.javaee.spec.IconImpl;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Ear5x tests
@@ -59,11 +57,6 @@
{
return true;
}
-
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(Ear50MetaData.class);
- }
public Ear5xUnitTestCase(String name)
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -25,13 +25,9 @@
import junit.framework.Test;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
-import org.jboss.metadata.ear.spec.Ear13DTDMetaData;
-import org.jboss.metadata.ear.spec.Ear14MetaData;
-import org.jboss.metadata.ear.spec.Ear50MetaData;
import org.jboss.metadata.ear.spec.Ear5xMetaData;
import org.jboss.metadata.ear.spec.EjbModuleMetaData;
import org.jboss.metadata.ear.spec.JavaModuleMetaData;
@@ -41,8 +37,6 @@
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Ear5x tests
@@ -58,22 +52,7 @@
{
return suite(JBossApp5xEverythingUnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("application_1_2.dtd", Ear13DTDMetaData.class);
- resolver.addClassBindingForLocation("application_1_3.dtd", Ear13DTDMetaData.class);
- resolver.addClassBindingForLocation("application_1_4.xsd", Ear14MetaData.class);
- resolver.addClassBindingForLocation("application_5.xsd", Ear50MetaData.class);
- resolver.addClassBindingForLocation("jboss-app_3_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.xsd", JBoss50AppMetaData.class);
- return resolver;
- }
-
+
public JBossApp5xEverythingUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -25,13 +25,10 @@
import junit.framework.Test;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Ear4x tests
@@ -46,17 +43,6 @@
return suite(JBossApp5xUnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss-app_3_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_4_2.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.dtd", JBoss50DTDAppMetaData.class);
- resolver.addClassBindingForLocation("jboss-app_5_0.xsd", JBoss50AppMetaData.class);
- return resolver;
- }
-
public JBossApp5xUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar11UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar11UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar11UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -23,16 +23,11 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.EntityMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
import org.jboss.metadata.ejb.spec.EjbJar1xMetaData;
import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import junit.framework.Test;
@@ -50,16 +45,6 @@
return suite(EjbJar11UnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_1_1.dtd", EjbJar1xMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public EjbJar11UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -32,8 +32,6 @@
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.CommitOption;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaDataWrapper;
@@ -47,8 +45,6 @@
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* 2.0 ejb-jar.xml tests.
@@ -64,17 +60,6 @@
return suite(EjbJar20UnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public EjbJar20UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -49,7 +49,6 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
import org.jboss.metadata.merge.MergeUtil;
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* EjbJar2xUnitTestCase.
@@ -63,13 +62,7 @@
{
return suite(EjbJar21EverythingUnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(EjbJar21MetaData.class);
- //return AbstractJavaEEMetaDataTest.initResolverJ2EE(EjbJar21MetaData.class);
- }
-
+
public EjbJar21EverythingUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -30,7 +30,6 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
@@ -39,8 +38,6 @@
import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* EjbJarUnitTestCase.
@@ -56,14 +53,6 @@
return suite(EjbJar21UnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- return resolver;
- }
-
public EjbJar21UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -62,7 +62,6 @@
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.ejb.spec.SessionType;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* EjbJar3xUnitTestCase.
@@ -76,13 +75,7 @@
{
return suite(EjbJar3xEverythingUnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(EjbJar30MetaData.class);
- //return initResolverJavaEE(EjbJar30MetaData.class);
- }
-
+
public EjbJar3xEverythingUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -56,7 +56,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* EjbJar3xUnitTestCase.
@@ -71,12 +70,6 @@
return suite(EjbJar3xUnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(EjbJar30MetaData.class);
- //return AbstractJavaEEMetaDataTest.initResolverJavaEE(EjbJar30MetaData.class);
- }
-
public EjbJar3xUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeActivationConfigUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeActivationConfigUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeActivationConfigUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -32,8 +32,6 @@
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
*
@@ -48,16 +46,6 @@
return suite(EjbJarJBossMergeActivationConfigUnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public EjbJarJBossMergeActivationConfigUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -54,8 +54,6 @@
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.Environment;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Tests the merge of ejb-jar.xml and jboss.xml
@@ -70,20 +68,6 @@
{
return suite(EjbJarJBossMergeEverythingUnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
-
- //
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
public EjbJarJBossMergeEverythingUnitTestCase(String name)
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss42UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -27,13 +27,9 @@
import junit.framework.Test;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.javaee.jboss.JBossPortComponentRef;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
@@ -43,8 +39,6 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Tests of jboss_4_2.dtd conforming documents
@@ -60,24 +54,6 @@
return suite(JBoss42UnitTestCase.class);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
- resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public static boolean validateSchema()
{
return true;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -60,7 +60,6 @@
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossSessionBeanJndiNameResolver;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
@@ -85,8 +84,6 @@
import org.jboss.metadata.merge.MergeUtil;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.test.metadata.javaee.JBossXBTestDelegate;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Miscellaneous tests with a JBoss 5 xml.
@@ -102,23 +99,7 @@
{
return suite(JBoss50UnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
+
public JBoss50UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -61,8 +61,6 @@
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -83,17 +81,7 @@
{
return suite(JBoss5xEverythingUnitTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
+
static Element getElement(String name, Element parent)
{
NodeList elements = parent.getElementsByTagName(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/SchemaVersionUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,14 +21,8 @@
*/
package org.jboss.test.metadata.ejb;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* A SchemaVersionUnitTestCase.
@@ -44,23 +38,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- resolver.addClassBindingForLocation("jboss_5_1.xsd", JBoss50MetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
/**
* Simple test of a jboss.xml with a 5.0 dtd doctype
* @throws Exception
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/whitespace/WhitespaceUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -36,8 +36,6 @@
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* JBAS-4612
@@ -53,26 +51,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_1_1.dtd", EjbJar1xMetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
- resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- resolver.addClassBinding("http://java.sun.com/xml/ns/javaee", EjbJar30MetaData.class);
- return resolver;
- }
-
public void testEjbJar30EnvEntry() throws Exception
{
EjbJar3xMetaData xml = unmarshal(EjbJar30MetaData.class);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -29,6 +29,7 @@
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
import org.jboss.xb.annotations.JBossXmlConstants;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
@@ -57,6 +58,11 @@
super(name);
}
+ public static SchemaBindingResolver initResolver()
+ {
+ return MetaDataSchemaResolverFactory.createSchemaResolver();
+ }
+
public static SchemaBindingResolver initResolverJavaEE(Class<?> clazz, String xsd)
{
DefaultSchemaResolver resolver = initResolverJavaEE(clazz);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta107/unit/OverrideImplicitLocalTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -35,7 +35,6 @@
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.test.metadata.jbmeta107.OverrideImplicitLocal;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* A bean implements one interface, but the descriptor says it's a remote
@@ -61,12 +60,7 @@
int i = packageName.lastIndexOf('.');
return packageName.substring(0, i);
}
-
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(EjbJar30MetaData.class);
- }
-
+
public void testOverrideImplicitLocal() throws Exception
{
Collection<Class<?>> classes = PackageScanner.loadClasses(getParentPackageName());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta119/unit/LocalBindingsUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta119/unit/LocalBindingsUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta119/unit/LocalBindingsUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -32,8 +32,6 @@
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -41,15 +39,6 @@
*/
public class LocalBindingsUnitTestCase extends AbstractJavaEEEverythingTest
{
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- return resolver;
- }
-
-
public LocalBindingsUnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta133/unit/DefaultClusterConfigUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta133/unit/DefaultClusterConfigUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta133/unit/DefaultClusterConfigUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -24,15 +24,12 @@
import org.jboss.ejb3.annotation.defaults.ClusteredDefaults;
import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
import org.jboss.metadata.process.processor.ejb.jboss.ClusterConfigDefaultValueProcessor;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* [JBMETA-133] generate a default cluster-config metadata,
@@ -49,14 +46,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public void testDefaultClusterConfig() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta154/unit/MergeBeanDefinitionsTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta154/unit/MergeBeanDefinitionsTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta154/unit/MergeBeanDefinitionsTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -30,13 +30,10 @@
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -49,25 +46,6 @@
super(name);
}
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-// resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
-// resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
-// resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
-// resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
@ScanPackage("org.jboss.test.metadata.jbmeta154")
public void test1() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta42/unit/Default2xNamingStrategyTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta42/unit/Default2xNamingStrategyTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta42/unit/Default2xNamingStrategyTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -27,8 +27,6 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -41,8 +39,6 @@
import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Legacy ejb 2.x naming tests
@@ -58,23 +54,6 @@
{
return suite(Default2xNamingStrategyTestCase.class);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
- resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
public Default2xNamingStrategyTestCase(String name)
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta56/unit/EnvironmentTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta56/unit/EnvironmentTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta56/unit/EnvironmentTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -22,10 +22,8 @@
package org.jboss.test.metadata.jbmeta56.unit;
import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
-import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceType;
@@ -34,8 +32,6 @@
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -43,25 +39,6 @@
*/
public class EnvironmentTestCase extends AbstractEJBEverythingTest
{
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
- resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public EnvironmentTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta66/unit/GenericBeanWithHomeTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta66/unit/GenericBeanWithHomeTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta66/unit/GenericBeanWithHomeTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,15 +21,11 @@
*/
package org.jboss.test.metadata.jbmeta66.unit;
-import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
@@ -37,25 +33,6 @@
*/
public class GenericBeanWithHomeTestCase extends AbstractEJBEverythingTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-// resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
-// resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
- resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
-// resolver.addClassBindingForLocation("jboss_3_0.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_3_2.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_4_0.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_4_2.dtd", JBoss50DTDMetaData.class);
-// resolver.addClassBindingForLocation("jboss_5_0.dtd", JBoss50DTDMetaData.class);
- resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
- // Set the JBoss50DTDMetaData class as the default for the jboss root element
-// resolver.addClassBindingForLocation("jboss", JBoss50DTDMetaData.class);
- // Workaround wildard resolution slowness
- resolver.addClassBinding("http://www.jboss.com/xml/ns/javaee", JBoss50MetaData.class);
- return resolver;
- }
-
public GenericBeanWithHomeTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -31,8 +31,6 @@
import org.jboss.metadata.jpa.spec.PersistenceMetaData;
import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test persistence metadata.
@@ -42,24 +40,11 @@
*/
public class PersistenceMDUnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("persistence_1_0.xsd", PersistenceMetaData.class);
- return resolver;
- }
-
public PersistenceMDUnitTestCase(String name)
{
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- enableTrace("org.jboss.xb");
- }
-
public void testDefaultMetaData() throws Throwable
{
List<PersistenceUnitMetaData> units = getPersistenceUnits(1);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -23,8 +23,6 @@
import org.jboss.metadata.rar.jboss.JBossRAMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test JCA jboss-ra.xml metadata.
@@ -34,14 +32,8 @@
*/
public class JbossRA10UnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
+ public JbossRA10UnitTestCase(String name)
{
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss-ra_1_0.xsd", JBossRAMetaData.class);
- return resolver;
- }
-
- public JbossRA10UnitTestCase(String name) {
super(name);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50NegativeUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50NegativeUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50NegativeUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -24,15 +24,9 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.jboss.logging.Logger;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test ResourceAdapter ds.xml metadata.
@@ -42,27 +36,11 @@
*/
public class JcaDs50NegativeUnitTestCase extends AbstractJavaEEEverythingTest
{
- private static final Logger log = Logger.getLogger(JcaDs50NegativeUnitTestCase.class);
-
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ManagedConnectionFactoryDeploymentGroup.class);
- return resolver;
- }
-
public JcaDs50NegativeUnitTestCase(String name)
{
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- enableTrace("org.jboss.xb");
- }
-
/**
* test miss jndi-name
*/
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -31,8 +31,6 @@
import org.jboss.metadata.rar.jboss.mcf.TxConnectionFactoryDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.XADataSourceDeploymentMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.resolver.MultiClassSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test JCA ds.xml metadata.
@@ -42,16 +40,8 @@
*/
public class JcaDs50UnitTestCase extends AbstractJavaEEMetaDataTest
{
- public static SchemaBindingResolver initResolver()
+ public JcaDs50UnitTestCase(String name)
{
- MultiClassSchemaResolver resolver = new MultiClassSchemaResolver();
- resolver.mapLocationToClasses("jboss-ds_5_0.xsd",
- ManagedConnectionFactoryDeploymentGroup.class,
- ConnectionFactoryDeploymentGroup.class);
- return resolver;
- }
-
- public JcaDs50UnitTestCase(String name) {
super(name);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,45 +21,23 @@
*/
package org.jboss.test.metadata.rar;
-import java.util.List;
import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.AdminObjectMetaData;
-import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
import org.jboss.metadata.rar.spec.ConnectorMetaData;
-import org.jboss.metadata.rar.spec.InboundRaMetaData;
-import org.jboss.metadata.rar.spec.JCA15MetaData;
-import org.jboss.metadata.rar.spec.MessageListenerMetaData;
-import org.jboss.metadata.rar.spec.OutboundRaMetaData;
-import org.jboss.metadata.rar.spec.ResourceAdapterMetaData;
-import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
/**
* Test ResourceAdapter ra.xml metadata.
*
* @author Jeff Zhang
* @version $Revision$
*/
-public class RA15EverythingUnitTestCase extends BaseRAUnitTestCase {
-
- public static SchemaBindingResolver initResolver()
+public class RA15EverythingUnitTestCase extends BaseRAUnitTestCase
+{
+ public RA15EverythingUnitTestCase(String name)
{
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("connector_1_5.xsd", JCA15MetaData.class);
- return resolver;
- }
-
- public RA15EverythingUnitTestCase(String name) {
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
public void testEverything() throws Exception
{
ConnectorMetaData connector = unmarshal();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -21,44 +21,23 @@
*/
package org.jboss.test.metadata.rar;
-import java.util.List;
import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.AdminObjectMetaData;
-import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
-import org.jboss.metadata.rar.spec.InboundRaMetaData;
import org.jboss.metadata.rar.spec.JCA16MetaData;
-import org.jboss.metadata.rar.spec.MessageListenerMetaData;
-import org.jboss.metadata.rar.spec.OutboundRaMetaData;
-import org.jboss.metadata.rar.spec.ResourceAdapterMetaData;
-import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
/**
* Test ResourceAdapter ra.xml metadata.
*
* @author Jeff Zhang
* @version $Revision$
*/
-public class RA16EverythingUnitTestCase extends BaseRAUnitTestCase {
-
- public static SchemaBindingResolver initResolver()
+public class RA16EverythingUnitTestCase extends BaseRAUnitTestCase
+{
+ public RA16EverythingUnitTestCase(String name)
{
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("connector_1_6.xsd", JCA16MetaData.class);
- return resolver;
- }
-
- public RA16EverythingUnitTestCase(String name) {
super(name);
}
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
public void testEverything() throws Exception
{
JCA16MetaData connector = unmarshal();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -36,9 +36,6 @@
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -63,13 +60,6 @@
}
private static final EntityResolver RESOLVER = new JBossEntityResolver();
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("connector_1_6.xsd", JCA16MetaData.class);
- return resolver;
- }
-
// TODO return true to see all the validation issues
public static boolean validateSchema()
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWeb50UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -31,10 +31,7 @@
import org.jboss.metadata.web.jboss.ReplicationGranularity;
import org.jboss.metadata.web.jboss.ReplicationTrigger;
import org.jboss.metadata.web.jboss.SnapshotMode;
-import org.jboss.metadata.web.spec.Web24MetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -46,17 +43,6 @@
*/
public class JBossWeb50UnitTestCase extends AbstractJavaEEEverythingTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("web-app_2_4.xsd", Web24MetaData.class);
- resolver.addClassBindingForLocation("jboss-web", JBoss50DTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss4xDTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss4xDTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_5_0.dtd", JBoss50DTDWebMetaData.class);
- return resolver;
- }
-
public JBossWeb50UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/JBossWebApp24UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -48,11 +48,8 @@
import org.jboss.metadata.web.jboss.JBoss4xDTDWebMetaData;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.Web24MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -63,15 +60,6 @@
*/
public class JBossWebApp24UnitTestCase extends AbstractJavaEEEverythingTest
{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("web-app_2_4.xsd", Web24MetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_0.dtd", JBoss4xDTDWebMetaData.class);
- resolver.addClassBindingForLocation("jboss-web_4_2.dtd", JBoss4xDTDWebMetaData.class);
- return resolver;
- }
-
public JBossWebApp24UnitTestCase(String name)
{
super(name);
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp23UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -26,7 +26,6 @@
import org.jboss.metadata.web.spec.Web23MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of 2.3 web-app
@@ -52,11 +51,6 @@
assertNotNull(servlet);
assertEquals("servlet0.class", servlet.getServletClass());
}
-
- public static SchemaBindingResolver initResolver()
- {
- return schemaResolverForClass(Web23MetaData.class);
- }
public void testEverything() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp24UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp24UnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp24UnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -34,8 +34,6 @@
import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Tests of 2.4 web-app elements
@@ -50,13 +48,6 @@
{
super(name);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("web-app_2_4.xsd", Web24MetaData.class);
- return resolver;
- }
public void testSecurityConstraint() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -41,13 +41,10 @@
import org.jboss.metadata.web.spec.ServletsMetaData;
import org.jboss.metadata.web.spec.TransportGuaranteeType;
import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
-import org.jboss.metadata.web.spec.Web25MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
* Test all entries of javaee 5 web-app
@@ -64,13 +61,6 @@
{
super(name);
}
-
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("web-app_2_5.xsd", Web25MetaData.class);
- return resolver;
- }
public void testEverything() throws Exception
{
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-05-06 11:07:07 UTC (rev 88254)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-05-06 12:38:34 UTC (rev 88255)
@@ -82,7 +82,19 @@
IGNORE.add("JBoss42_testServiceRefQnameWithNS.xml");
}
- private static final EntityResolver RESOLVER = new JBossEntityResolver();
+ private static final EntityResolver RESOLVER = new JBossEntityResolver()
+ {
+ @Override
+ public InputSource resolveEntity (String publicId, String systemId) throws SAXException, IOException
+ {
+ InputSource is = super.resolveEntity(publicId, systemId);
+ if(is == null)
+ {
+ log.warn("Failed to resolve " + publicId + ", " + systemId);
+ }
+ return is;
+ }
+ };
private int total;
private int invalid;
@@ -118,7 +130,6 @@
}
});
- // TODO there are currently 6 expected
assertEquals("Zero invalid files among total of " + total, 0, invalid);
}
More information about the jboss-cvs-commits
mailing list