[jboss-cvs] JBossAS SVN: r97506 - in projects/metadata/ejb/trunk/src: main/java/org/jboss/metadata/annotation/creator/ejb/jboss and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 7 08:29:53 EST 2009
Author: jaikiran
Date: 2009-12-07 08:29:53 -0500 (Mon, 07 Dec 2009)
New Revision: 97506
Added:
projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/
projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/NoOp.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/SimpleSLSB.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/
projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java
projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/
projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-21.xml
projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml
projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml
Modified:
projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/HomeProcessingUnitTestCase.java
projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java
Log:
JBMETA-228 Set the ejb-version to LATEST, if metadata is created out of annotations
Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/EjbJar30Creator.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -33,6 +33,7 @@
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
/**
* Create the correct meta data for a set of annotated classes.
@@ -81,7 +82,11 @@
protected EjbJar30MetaData create()
{
EjbJar30MetaData metaData = new EjbJar30MetaData();
- metaData.setVersion("3.0");
+ // When the ejb version is *not* explicitly set through
+ // ejb-jar.xml (i.e. if the deployment is based purely
+ // on annotations), then the ejb version of the metadata
+ // is always the latest ejb-jar xsd version
+ metaData.setVersion(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION);
return metaData;
}
Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/JBoss50Creator.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -112,7 +112,11 @@
{
JBoss50MetaData metaData = new JBoss50MetaData();
metaData.setVersion("5.0");
- metaData.setEjbVersion("3.0");
+ // When the ejb version is *not* explicitly set through
+ // ejb-jar.xml (i.e. if the deployment is based purely
+ // on annotations), then the ejb version of the metadata
+ // is always the latest ejb-jar xsd version
+ metaData.setEjbVersion(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION);
return metaData;
}
Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -41,7 +41,7 @@
private String dtdPublicId;
private String dtdSystemId;
- /** The version */
+ /** The version*/
private String version;
/** The ejb client jar */
@@ -57,6 +57,11 @@
private AssemblyDescriptorMetaData assemblyDescriptor;
/**
+ * The latest available ejb-jar xsd version
+ */
+ public static final String LATEST_EJB_JAR_XSD_VERSION = "3.1";
+
+ /**
* Create a new EjbJarMetaData.
*/
public EjbJarMetaData()
Added: projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/NoOp.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/NoOp.java (rev 0)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/NoOp.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.test.ejbversion;
+
+/**
+ * NoOp
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface NoOp
+{
+
+}
Added: projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/SimpleSLSB.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/SimpleSLSB.java (rev 0)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/SimpleSLSB.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.test.ejbversion;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+/**
+ * SimpleSLSB
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+ at Stateless
+ at Local(NoOp.class)
+public class SimpleSLSB
+{
+
+}
Added: projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java (rev 0)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,167 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.metadata.ejb.test.ejbversion.unit;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
+
+import java.lang.reflect.AnnotatedElement;
+import java.net.URL;
+import java.util.Collection;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
+import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar31MetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.test.metadata.common.PackageScanner;
+import org.jboss.test.metadata.common.ScanPackage;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.resolver.MultiClassSchemaResolver;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * EjbVersionTestCase
+ *
+ * Tests to check that the ejb-version set in the metadata, created in various
+ * ways (through ejb-jar.xml or annotations or merged), is correct.
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class EjbVersionTestCase
+{
+
+ private static Logger logger = Logger.getLogger(EjbVersionTestCase.class);
+
+ private static MutableSchemaResolver schemaBindingResolver;
+
+ private static UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ schemaBindingResolver = new MultiClassSchemaResolver();
+ schemaBindingResolver.mapLocationToClass("ejb-jar_3_1.xsd", EjbJar31MetaData.class);
+ schemaBindingResolver.mapLocationToClass("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
+ schemaBindingResolver.mapLocationToClass("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
+ }
+
+ /**
+ * Tests that metadata created solely out of annotations, is set to ejb-version
+ * "latest"
+ */
+ @Test
+ @ScanPackage("org.jboss.metadata.ejb.test.ejbversion")
+ public void testEjbVersionOfMetadataFromAnnotations() throws Exception
+ {
+ AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+ JBoss50Creator creator = new JBoss50Creator(finder);
+ Collection<Class<?>> classes = PackageScanner.loadClasses();
+ JBossMetaData jbossMetadata = creator.create(classes);
+ assertNotNull("JBoss metadata was null", jbossMetadata);
+
+ EjbJar30Creator ejbJarCreator = new EjbJar30Creator(finder);
+ EjbJarMetaData ejbJarMetaData = ejbJarCreator.create(classes);
+ assertNotNull("EjbJarMetadata was null", ejbJarMetaData);
+ // Since the metadata was created through annotations, it's ejb-version should
+ // be "latest"
+ assertEquals("ejb-version in jboss metadata, created out of annotations, is *not* latest version",
+ EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, jbossMetadata.getEjbVersion());
+ assertEquals("ejb-version in ejbjar metadata, created out of annotations, is *not* latest version",
+ EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, ejbJarMetaData.getVersion());
+
+
+ }
+
+ /**
+ * Tests that metadata created out of ejb-jar.xml has the correct ejb-version set (as
+ * set in the ejb-jar.xml)
+ * @throws Exception
+ */
+ @Test
+ public void testEjbVersionOfMetadataFromXml() throws Exception
+ {
+ EjbJarMetaData ejb21 = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-21.xml");
+ assertNotNull("Metadata was null for bean version 2.1",ejb21);
+ assertEquals("ejb-version EJB 2.1 metadata was incorrect","2.1", ejb21.getVersion());
+
+ EjbJarMetaData ejb30 = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml");
+ assertEquals("ejb-version EJB 3.0 metadata was incorrect","3.0", ejb30.getVersion());
+
+ EjbJarMetaData ejb31 = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml");
+ assertEquals("ejb-version EJB 3.1 metadata was incorrect","3.1", ejb31.getVersion());
+ }
+
+ /**
+ * Tests that the correct ejb-version is set on merged metadata
+ * @throws Exception
+ */
+ @Test
+ @ScanPackage("org.jboss.metadata.ejb.test.ejbversion")
+ public void testEjbVersionOfMergedMetadata() throws Exception
+ {
+ EjbJarMetaData ejb30XmlMetadata = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml");
+ assertEquals("ejb-version EJB 3.0 metadata was incorrect","3.0", ejb30XmlMetadata.getVersion());
+
+ AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+ JBoss50Creator creator = new JBoss50Creator(finder);
+ Collection<Class<?>> classes = PackageScanner.loadClasses();
+ JBossMetaData metadataFromAnnotations = creator.create(classes);
+
+ // now merge (final ejb-version should be 3.0 - the one set in ejb-jar.xml)
+ JBossMetaData mergedMetadata = new JBossMetaData();
+ mergedMetadata.merge(metadataFromAnnotations, ejb30XmlMetadata);
+
+ assertEquals("ejb-version in merged metadata is incorrect","3.0", mergedMetadata.getEjbVersion());
+
+
+ }
+
+ /**
+ * Utility method
+ *
+ * @param <T>
+ * @param type
+ * @param resource
+ * @return
+ * @throws JBossXBException
+ */
+ private static <T> T unmarshal(Class<T> type, String resource) throws JBossXBException
+ {
+ Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
+ unmarshaller.setValidation(false);
+ URL url = type.getResource(resource);
+ if (url == null)
+ throw new IllegalArgumentException("Failed to find resource " + resource);
+ return type.cast(unmarshaller.unmarshal(url.toString(), schemaBindingResolver));
+ }
+}
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -60,6 +60,7 @@
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
@@ -397,7 +398,7 @@
EjbJar30MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
@@ -611,7 +612,7 @@
EjbJar30MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
//assertNotNull("no assembly descriptor defined", metaData.getAssemblyDescriptor());
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/JBossAnnotationEjb3UnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -68,6 +68,7 @@
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
@@ -146,7 +147,7 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, metaData.getEjbVersion());
assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
@@ -381,7 +382,7 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, metaData.getEjbVersion());
assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
@@ -940,7 +941,7 @@
JBoss50MetaData metaData = creator.create(classes);
assertTrue(metaData.isEJB3x());
- assertEquals("3.0", metaData.getEjbVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, metaData.getEjbVersion());
assertEquals("5.0", metaData.getVersion());
assertNotNull("no beans defined", metaData.getEnterpriseBeans());
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -236,7 +236,7 @@
EjbJar30MetaData ejb3MetaData = creator.create(classes);
assertTrue(ejb3MetaData.isEJB3x());
- assertEquals("3.0", ejb3MetaData.getVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, ejb3MetaData.getVersion());
//Parse the ejb-jar.xml
EjbJarMetaData specResult = unmarshal("EjbJar3xCTSRunAsConfig.xml",
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta40/unit/JBossImplicitLocalIntefaceUnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -31,6 +31,7 @@
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
@@ -70,7 +71,7 @@
jbossMetaData = processor.process(jbossMetaData);
assertTrue(jbossMetaData.isEJB3x());
- assertEquals("3.0", jbossMetaData.getEjbVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, jbossMetaData.getEjbVersion());
assertEquals("5.0", jbossMetaData.getVersion());
assertNotNull("no beans defined", jbossMetaData.getEnterpriseBeans());
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/HomeProcessingUnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/HomeProcessingUnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/HomeProcessingUnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -33,6 +33,7 @@
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.jbmeta41.MultipleReturnTypeBean;
import org.jboss.test.metadata.jbmeta41.MyFailingStatelessBean;
@@ -162,7 +163,7 @@
EjbJar30Creator creator = new EjbJar30Creator(finder);
EjbJar30MetaData specMetaData = creator.create(classes);
- assertEquals("3.0", specMetaData.getVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, specMetaData.getVersion());
JBossMetaData mergedMetaData = new JBossMetaData();
JBossMetaData metaData = null;
Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java 2009-12-07 13:07:39 UTC (rev 97505)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/test/metadata/jbmeta41/unit/JBossProcessingUnitTestCase.java 2009-12-07 13:29:53 UTC (rev 97506)
@@ -32,6 +32,7 @@
import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.jbmeta41.MultipleReturnTypeBean;
import org.jboss.test.metadata.jbmeta41.MyFailingStatelessBean;
@@ -162,7 +163,7 @@
JBoss50MetaData jbossMetaData = creator.create(classes);
- assertEquals("3.0", jbossMetaData.getEjbVersion());
+ assertEquals(EjbJarMetaData.LATEST_EJB_JAR_XSD_VERSION, jbossMetaData.getEjbVersion());
assertEquals("5.0", jbossMetaData.getVersion());
return (JBossSessionBeanMetaData) jbossMetaData.getEnterpriseBean(enterpriseBean);
}
Added: projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-21.xml
===================================================================
--- projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-21.xml (rev 0)
+++ projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-21.xml 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Dummy</ejb-name>
+ <home>Dummy</home>
+ <remote>Dummy</remote>
+ <ejb-class>Dummy</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml
===================================================================
--- projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml (rev 0)
+++ projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-30.xml 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Simple30Bean</ejb-name>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml
===================================================================
--- projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml (rev 0)
+++ projects/metadata/ejb/trunk/src/test/resources/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml 2009-12-07 13:29:53 UTC (rev 97506)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>Simple31Bean</ejb-name>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list