[jboss-cvs] JBossAS SVN: r72340 - in projects/metadata/trunk/src/test: java/org/jboss/test/metadata/annotation/ejb3/partialxml and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 17 08:01:56 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-04-17 08:01:55 -0400 (Thu, 17 Apr 2008)
New Revision: 72340
Added:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink2Bean.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink3Bean.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml.xml
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
Log:
Tests of partial xml merges
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 2008-04-17 11:38:28 UTC (rev 72339)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2008-04-17 12:01:55 UTC (rev 72340)
@@ -41,6 +41,7 @@
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.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
@@ -77,6 +78,8 @@
import org.jboss.metadata.ejb.spec.SessionType;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
@@ -89,6 +92,8 @@
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview21Remote;
import org.jboss.test.metadata.annotation.ejb3.multiview.Multiview3Remote;
import org.jboss.test.metadata.annotation.ejb3.multiview.MultiviewHome;
+import org.jboss.test.metadata.annotation.ejb3.partialxml.EjbLink2Bean;
+import org.jboss.test.metadata.annotation.ejb3.partialxml.EjbLink3Bean;
import org.jboss.test.metadata.annotation.ejb3.runas.InterMediateBean;
import org.jboss.test.metadata.common.PackageScanner;
import org.jboss.test.metadata.common.ScanPackage;
@@ -523,6 +528,46 @@
}
/**
+ *
+ * @throws Exception
+ */
+ public void testAnnotationMergedViewWithPartialXml()
+ throws Exception
+ {
+ Class<?>[] beanClasses = {
+ EjbLink2Bean.class,
+ EjbLink3Bean.class
+ };
+ List<Class<?>> classes = Arrays.asList(beanClasses);
+ AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+ EjbJar30Creator creator = new EjbJar30Creator(finder);
+ EjbJar30MetaData metaData = creator.create(classes);
+ EjbJar3xMetaData specMetaData = unmarshal(EjbJar3xMetaData.class);
+ EjbJar3xMetaData merged = new EjbJar30MetaData();
+ AnnotationMergedView.merge(merged, specMetaData, metaData);
+
+ JBoss50MetaData jbossMetaData = unmarshal("AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml", JBoss50MetaData.class, null);
+ // Create a merged view
+ JBossMetaData jbossMergedMetaData = new JBossMetaData();
+ jbossMergedMetaData.merge(jbossMetaData, merged);
+
+ EnterpriseBeanMetaData bean2 = merged.getEnterpriseBean("EjbLink2Bean");
+ assertNotNull(bean2);
+ EJBReferenceMetaData ref1 = bean2.getEjbReferenceByName("ejb/EjbLink1Bean");
+ assertNotNull(ref1);
+ EJBLocalReferenceMetaData ref3 = bean2.getEjbLocalReferenceByName("ejb/EjbLink3Bean");
+ assertNotNull(ref3);
+
+ EnterpriseBeanMetaData bean3 = merged.getEnterpriseBean("EjbLink3Bean");
+ assertNotNull(bean3);
+
+ JBossEnterpriseBeanMetaData jbean2 = jbossMergedMetaData.getEnterpriseBean("EjbLink2Bean");
+ assertNotNull(jbean2);
+ JBossEnterpriseBeanMetaData jbean3 = jbossMergedMetaData.getEnterpriseBean("EjbLink3Bean");
+ assertNotNull(jbean3);
+ }
+
+ /**
* Test merging annotation based metadata without xml
* @throws Exception
*/
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink2Bean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink2Bean.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink2Bean.java 2008-04-17 12:01:55 UTC (rev 72340)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.test.metadata.annotation.ejb3.partialxml;
+
+import javax.ejb.Stateless;
+
+ at Stateless(name = "EjbLink2Bean")
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class EjbLink2Bean
+{
+
+}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink3Bean.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink3Bean.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/partialxml/EjbLink3Bean.java 2008-04-17 12:01:55 UTC (rev 72340)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.test.metadata.annotation.ejb3.partialxml;
+
+import javax.ejb.Stateless;
+
+ at Stateless(name = "EjbLink3Bean")
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class EjbLink3Bean
+{
+
+}
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml 2008-04-17 12:01:55 UTC (rev 72340)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <enterprise-beans>
+ <ejb>
+ <ejb-name>EjbLink2Bean</ejb-name>
+ <jndi-name>ejb3_stateless_ejblink_one_EjbLink2Bean</jndi-name>
+ <ejb-ref>
+ <ejb-ref-name>ejb/EjbLink1Bean</ejb-ref-name>
+ </ejb-ref>
+ <ejb-ref>
+ <ejb-ref-name>ejb/EjbLink3Bean</ejb-ref-name>
+ </ejb-ref>
+ </ejb>
+
+ </enterprise-beans>
+</jboss>
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml.xml 2008-04-17 12:01:55 UTC (rev 72340)
@@ -0,0 +1,25 @@
+<?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"
+ version="3.0"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+ <enterprise-beans>
+ <session>
+ <ejb-name>EjbLink2Bean</ejb-name>
+ <ejb-class>org.jboss.test.metadata.annotation.ejb3.partialxml.EjbLink2Bean</ejb-class>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/EjbLink1Bean</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <ejb-link>one_ejb.jar#EjbLink1Bean</ejb-link>
+ </ejb-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EjbLink3Bean</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <ejb-link>EjbLink3Bean</ejb-link>
+ </ejb-local-ref>
+
+ </session>
+ </enterprise-beans>
+</ejb-jar>
More information about the jboss-cvs-commits
mailing list