[jboss-cvs] JBossAS SVN: r68909 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ejb and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jan 12 02:12:40 EST 2008


Author: scott.stark at jboss.org
Date: 2008-01-12 02:12:40 -0500 (Sat, 12 Jan 2008)
New Revision: 68909

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21_testMultipleMerge.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss40_testMultipleMerge.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
Log:
JBMETA-2, test of entity merge issue

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	2008-01-11 22:00:51 UTC (rev 68908)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java	2008-01-12 07:12:40 UTC (rev 68909)
@@ -30,20 +30,23 @@
 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;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
 import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 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.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Scott.Stark at jboss.org
  * @version $Revision: 1.1 $
  */
 public class EjbJar21UnitTestCase extends AbstractJavaEEMetaDataTest
@@ -55,8 +58,10 @@
    
    public static SchemaBindingResolver initResolver()
    {
-      return schemaResolverForClass(EjbJar21MetaData.class);
-      //return AbstractJavaEEMetaDataTest.initResolverJ2EE(EjbJar21MetaData.class);
+      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)
@@ -119,4 +124,20 @@
       assertTrue("Echo can invoke StatelessSessionLocalHome.create", perms.contains(echo));
       assertTrue("EchoLocal can invoke StatelessSessionLocalHome.create", perms.contains(echoLocal));
    }
+
+   public void testMultipleMerge()
+      throws Exception
+   {
+      EjbJar2xMetaData result = unmarshal();
+      JBossMetaData jboss = unmarshal("JBoss40_testMultipleMerge.xml", JBossMetaData.class);
+      JBossEnterpriseBeansMetaData beans = jboss.getEnterpriseBeans();
+      assertEquals(4, beans.size());
+      JBossEnterpriseBeanMetaData entity = beans.get("EntityCallee");
+      assertTrue(entity instanceof JBossEntityBeanMetaData);
+      JBossMetaData jbossMetaData = new JBossMetaData();
+      jbossMetaData.merge(jboss, result);
+      entity = jbossMetaData.getEnterpriseBean("EntityCallee");
+      JBossEntityBeanMetaData jentity = (JBossEntityBeanMetaData) entity;
+      assertEquals("caller-info.EntityCallee", jentity.getJndiName());
+   }
 }

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21_testMultipleMerge.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21_testMultipleMerge.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21_testMultipleMerge.xml	2008-01-12 07:12:40 UTC (rev 68909)
@@ -0,0 +1,119 @@
+<?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>
+         <description>The session facade</description>
+         <ejb-name>SubjectSessionFacade</ejb-name>
+         <home>org.jboss.test.security.interfaces.SubjectSessionHome</home>
+         <remote>org.jboss.test.security.interfaces.SubjectSession</remote>
+         <ejb-class>org.jboss.test.security.ejb.SubjectSessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+         <ejb-ref>
+            <ejb-ref-name>ejb/StatelessSession</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
+            <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
+            <ejb-link>StatelessSessionCallee</ejb-link>
+         </ejb-ref>
+         <ejb-ref>
+            <ejb-ref-name>ejb/StatefulSession</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <home>org.jboss.test.security.interfaces.StatefulSessionHome</home>            <remote>org.jboss.test.security.interfaces.StatefulSession</remote>            <ejb-link>StatefulSessionCallee</ejb-link>
+         </ejb-ref>
+         <ejb-ref>
+            <ejb-ref-name>ejb/Entity</ejb-ref-name>
+            <ejb-ref-type>Entity</ejb-ref-type>
+            <home>org.jboss.test.security.interfaces.EntityHome</home>
+            <remote>org.jboss.test.security.interfaces.Entity</remote>
+            <ejb-link>EntityCallee</ejb-link>
+         </ejb-ref>
+      </session>
+
+      <session>
+         <description>A secured stateless session bean</description>
+         <ejb-name>StatelessSessionCallee</ejb-name>
+         <home>org.jboss.test.security.interfaces.StatelessSessionHome</home>
+         <remote>org.jboss.test.security.interfaces.StatelessSession</remote>
+         <ejb-class>org.jboss.test.security.ejb.StatelessSessionBean4</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+
+      <session>
+         <description>A secured stateful session bean</description>
+         <ejb-name>StatefulSessionCallee</ejb-name>
+         <home>org.jboss.test.security.interfaces.StatefulSessionHome</home>
+         <remote>org.jboss.test.security.interfaces.StatefulSession</remote>
+         <ejb-class>org.jboss.test.security.ejb.StatefulSessionBean</ejb-class>         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+
+      <entity>
+         <description>A secured entity bean</description>
+         <ejb-name>EntityCallee</ejb-name>
+         <home>org.jboss.test.security.interfaces.EntityHome</home>
+         <remote>org.jboss.test.security.interfaces.Entity</remote>
+         <ejb-class>org.jboss.test.security.ejb.Cmp2Bean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>EntityCallee</abstract-schema-name>
+         <cmp-field>
+            <field-name>key</field-name>
+         </cmp-field>
+         <primkey-field>key</primkey-field>
+      </entity>
+   </enterprise-beans>
+
+   <assembly-descriptor>
+      <security-role>
+         <role-name>CallerInfoFacadeRole</role-name>
+      </security-role>
+      <security-role>
+         <role-name>CallerInfoStatelessRole</role-name>
+      </security-role>
+      <security-role>
+         <role-name>CallerInfoStatefulRole</role-name>
+      </security-role>
+      <security-role>
+         <role-name>CallerInfoEntityRole</role-name>
+      </security-role>
+
+      <method-permission>
+         <role-name>CallerInfoFacadeRole</role-name>
+         <method>
+            <ejb-name>SubjectSessionFacade</ejb-name>
+            <method-name>*</method-name>
+         </method>
+      </method-permission>
+      <method-permission>
+         <role-name>CallerInfoStatelessRole</role-name>
+         <method>
+            <ejb-name>StatelessSessionCallee</ejb-name>
+            <method-name>*</method-name>
+         </method>
+      </method-permission>
+      <method-permission>
+         <role-name>CallerInfoStatefulRole</role-name>
+         <method>
+            <ejb-name>StatefulSessionCallee</ejb-name>
+            <method-name>*</method-name>
+         </method>
+      </method-permission>
+      <method-permission>
+         <role-name>CallerInfoEntityRole</role-name>
+         <method>
+            <ejb-name>EntityCallee</ejb-name>
+            <method-name>*</method-name>
+         </method>
+      </method-permission>
+
+   </assembly-descriptor>
+</ejb-jar>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21_testMultipleMerge.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss40_testMultipleMerge.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss40_testMultipleMerge.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss40_testMultipleMerge.xml	2008-01-12 07:12:40 UTC (rev 68909)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+   "-//JBoss//DTD JBOSS 4.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+   
+<!-- The jboss.xml descriptor for the caller info tests -->
+<jboss>
+   <security-domain>java:/jaas/caller-info-test</security-domain>
+   
+   <enterprise-beans>
+      <session>
+         <ejb-name>SubjectSessionFacade</ejb-name>
+         <jndi-name>caller-info.SubjectSessionFacade</jndi-name>
+      </session>
+      <session>
+         <ejb-name>StatelessSessionCallee</ejb-name>
+         <jndi-name>caller-info.StatelessSessionCallee</jndi-name>
+      </session>
+      <session>
+         <ejb-name>StatefulSessionCallee</ejb-name>
+         <jndi-name>caller-info.StatefulSessionCallee</jndi-name>
+      </session>
+      <entity>
+         <ejb-name>EntityCallee</ejb-name>
+         <jndi-name>caller-info.EntityCallee</jndi-name>
+      </entity>
+   </enterprise-beans>
+   
+</jboss>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss40_testMultipleMerge.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native




More information about the jboss-cvs-commits mailing list