[jboss-cvs] JBossAS SVN: r72271 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 16 06:29:07 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-04-16 06:29:06 -0400 (Wed, 16 Apr 2008)
New Revision: 72271
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityGenericWrapper.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_MdbGeneric_ejb-jar.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_SessionGeneric_ejb-jar.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_generic_jboss.xml
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
Log:
JBMETA-17 (with roll-back of previous changes for this issue)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java 2008-04-16 09:34:18 UTC (rev 72270)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java 2008-04-16 10:29:06 UTC (rev 72271)
@@ -47,11 +47,7 @@
/** The top level metadata */
private JBossMetaData jbossMetaData;
-
- public enum EnterpriseBeanType {
- MESSAGE_DRIVEN, SESSION, SERVICE
- }
-
+
/**
* Create a new EnterpriseBeansMetaData.
*/
@@ -100,36 +96,7 @@
{
return jbossMetaData;
}
-
- /**
- * Return the EnterpriseBeanType for this EJB
- *
- * @param ejb
- * @return
- */
- public static EnterpriseBeanType getEnterpriseBeanType(JBossEnterpriseBeanMetaData ejb)
- {
- // Initialize
- EnterpriseBeanType beanType = null;
- // Determine type of bean from original
- if (ejb.isMessageDriven())
- {
- beanType = EnterpriseBeanType.MESSAGE_DRIVEN;
- }
- else if(ejb.isSession())
- {
- beanType = EnterpriseBeanType.SESSION;
- }
- else if(ejb.isService())
- {
- beanType = EnterpriseBeanType.SERVICE;
- }
-
- // Return
- return beanType;
- }
-
@XmlTransient
public void setEjbJarMetaData(JBossMetaData ejbJarMetaData)
{
@@ -169,41 +136,24 @@
// Check for a generic bean that maps to a session bean
if(jejb instanceof JBossGenericBeanMetaData)
{
- // Cast
JBossGenericBeanMetaData gejb = (JBossGenericBeanMetaData) jejb;
-
- // Default bean type to session
- EnterpriseBeanType beanType = EnterpriseBeanType.SESSION;
-
- // Get bean type from orginal
- EnterpriseBeanType defaultType = JBossEnterpriseBeansMetaData.getEnterpriseBeanType(gejb);
- if (defaultType != null)
+ if(ejb.isSession())
{
- beanType = defaultType;
+ mergedEJB = new JBossSessionBeanMetaData();
+ jejb = new JBossSessionGenericWrapper(gejb);
}
-
- // If specified, use override
- EnterpriseBeanType overrideType = JBossEnterpriseBeansMetaData.getEnterpriseBeanType(jejb);
- if (overrideType != null)
+ else if(ejb.isMessageDriven())
{
- beanType = overrideType;
+ mergedEJB = new JBossMessageDrivenBeanMetaData();
+ jejb = new JBossMessageDrivenBeanGenericWrapper(gejb);
}
-
- // Create a JBossSessionBeanMetaData as the merged output
- switch(beanType)
+ else // must be entity
{
- case SESSION:
- mergedEJB = new JBossSessionBeanMetaData();
- jejb = new JBossSessionGenericWrapper(gejb);
- break;
- case MESSAGE_DRIVEN:
- mergedEJB = new JBossMessageDrivenBeanMetaData();
- jejb = new JBossMessageDrivenBeanGenericWrapper(gejb);
- break;
+ mergedEJB = new JBossEntityBeanMetaData();
+ jejb = new JBossEntityGenericWrapper(gejb);
}
-
-
}
+
if(mergedEJB == null)
{
if(jejb != null)
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityGenericWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityGenericWrapper.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityGenericWrapper.java 2008-04-16 10:29:06 UTC (rev 72271)
@@ -0,0 +1,420 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.metadata.ejb.jboss;
+
+import java.lang.reflect.Method;
+import java.util.Set;
+
+import javax.ejb.TransactionAttributeType;
+import javax.ejb.TransactionManagementType;
+
+import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
+import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
+import org.jboss.metadata.ejb.spec.MethodInterfaceType;
+import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
+import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
+import org.jboss.metadata.javaee.jboss.AnnotationsMetaData;
+import org.jboss.metadata.javaee.jboss.IgnoreDependencyMetaData;
+import org.jboss.metadata.javaee.jboss.JndiRefsMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+
+/**
+ * Create a JBossEntityBeanMetaData from a JBossGenericBeanMetaData for
+ * use in merging a JBossGenericBeanMetaData into a JBossEntityBeanMetaData,
+ *
+ * @author alex at jboss.org
+ * @version $Revision: 68866 $
+ */
+class JBossEntityGenericWrapper extends JBossEntityBeanMetaData
+{
+ private static final long serialVersionUID = 1;
+ private JBossGenericBeanMetaData delegate;
+ JBossEntityGenericWrapper(JBossGenericBeanMetaData delegate)
+ {
+ this.delegate = delegate;
+ }
+ public Set<String> determineAllDepends()
+ {
+ return delegate.determineAllDepends();
+ }
+ public String determineConfigurationName()
+ {
+ return delegate.determineConfigurationName();
+ }
+ public ContainerConfigurationMetaData determineContainerConfiguration()
+ {
+ return delegate.determineContainerConfiguration();
+ }
+ public InvokerBindingMetaData determineInvokerBinding(String invokerName)
+ {
+ return delegate.determineInvokerBinding(invokerName);
+ }
+ public InvokerBindingsMetaData determineInvokerBindings()
+ {
+ return delegate.determineInvokerBindings();
+ }
+ public String determineLocalJndiName()
+ {
+ return delegate.determineLocalJndiName();
+ }
+ public boolean equals(Object obj)
+ {
+ return delegate.equals(obj);
+ }
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
+ {
+ return delegate.getAnnotatedEjbReferences();
+ }
+ public AnnotationsMetaData getAnnotations()
+ {
+ return delegate.getAnnotations();
+ }
+ public String getAopDomainName()
+ {
+ return delegate.getAopDomainName();
+ }
+ public String getConfigurationName()
+ {
+ return delegate.getConfigurationName();
+ }
+ public String getContainerObjectNameJndiName()
+ {
+ return delegate.getContainerObjectNameJndiName();
+ }
+ public ContainerTransactionsMetaData getContainerTransactions()
+ {
+ return delegate.getContainerTransactions();
+ }
+ public String getDefaultConfigurationName()
+ {
+ return delegate.getDefaultConfigurationName();
+ }
+ public Set<String> getDepends()
+ {
+ return delegate.getDepends();
+ }
+ public DescriptionGroupMetaData getDescriptionGroup()
+ {
+ return delegate.getDescriptionGroup();
+ }
+ public String getEjbClass()
+ {
+ return delegate.getEjbClass();
+ }
+ public JBossMetaData getEjbJarMetaData()
+ {
+ return delegate.getEjbJarMetaData();
+ }
+ public EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name)
+ {
+ return delegate.getEjbLocalReferenceByName(name);
+ }
+ public EJBLocalReferencesMetaData getEjbLocalReferences()
+ {
+ return delegate.getEjbLocalReferences();
+ }
+ public String getEjbName()
+ {
+ return delegate.getEjbName();
+ }
+ public EJBReferenceMetaData getEjbReferenceByName(String name)
+ {
+ return delegate.getEjbReferenceByName(name);
+ }
+ public EJBReferencesMetaData getEjbReferences()
+ {
+ return delegate.getEjbReferences();
+ }
+ public JBossEnterpriseBeansMetaData getEnterpriseBeansMetaData()
+ {
+ return delegate.getEnterpriseBeansMetaData();
+ }
+ public EnvironmentEntriesMetaData getEnvironmentEntries()
+ {
+ return delegate.getEnvironmentEntries();
+ }
+ public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+ {
+ return delegate.getEnvironmentEntryByName(name);
+ }
+ public ExcludeListMetaData getExcludeList()
+ {
+ return delegate.getExcludeList();
+ }
+ public String getId()
+ {
+ return delegate.getId();
+ }
+ public IgnoreDependencyMetaData getIgnoreDependency()
+ {
+ return delegate.getIgnoreDependency();
+ }
+ public InvokerBindingsMetaData getInvokerBindings()
+ {
+ return delegate.getInvokerBindings();
+ }
+ public IORSecurityConfigMetaData getIorSecurityConfig()
+ {
+ return delegate.getIorSecurityConfig();
+ }
+ public JBossMetaData getJBossMetaData()
+ {
+ return delegate.getJBossMetaData();
+ }
+ public JBossMetaData getJBossMetaDataWithCheck()
+ {
+ return delegate.getJBossMetaDataWithCheck();
+ }
+ public Environment getJndiEnvironmentRefsGroup()
+ {
+ return delegate.getJndiEnvironmentRefsGroup();
+ }
+ public String getJndiName()
+ {
+ return delegate.getJndiName();
+ }
+ public JndiRefsMetaData getJndiRefs()
+ {
+ return delegate.getJndiRefs();
+ }
+ public String getKey()
+ {
+ return delegate.getKey();
+ }
+ public String getLocalJndiName()
+ {
+ return delegate.getLocalJndiName();
+ }
+ public String getMappedName()
+ {
+ return delegate.getMappedName();
+ }
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(
+ String name)
+ {
+ return delegate.getMessageDestinationReferenceByName(name);
+ }
+ public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+ {
+ return delegate.getMessageDestinationReferences();
+ }
+ public MethodAttributesMetaData getMethodAttributes()
+ {
+ return delegate.getMethodAttributes();
+ }
+ public MethodPermissionsMetaData getMethodPermissions()
+ {
+ return delegate.getMethodPermissions();
+ }
+ public Set<String> getMethodPermissions(String methodName,
+ Class<?>[] params, MethodInterfaceType interfaceType)
+ {
+ return delegate.getMethodPermissions(methodName, params, interfaceType);
+ }
+ public int getMethodTransactionTimeout(Method method)
+ {
+ return delegate.getMethodTransactionTimeout(method);
+ }
+ public int getMethodTransactionTimeout(String methodName)
+ {
+ return delegate.getMethodTransactionTimeout(methodName);
+ }
+ public TransactionAttributeType getMethodTransactionType(Method m,
+ MethodInterfaceType iface)
+ {
+ return delegate.getMethodTransactionType(m, iface);
+ }
+ public TransactionAttributeType getMethodTransactionType(String methodName,
+ Class<?>[] params, MethodInterfaceType iface)
+ {
+ return delegate.getMethodTransactionType(methodName, params, iface);
+ }
+ public String getName()
+ {
+ return delegate.getName();
+ }
+ public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(
+ String name)
+ {
+ return delegate.getPersistenceContextReferenceByName(name);
+ }
+ public PersistenceContextReferencesMetaData getPersistenceContextRefs()
+ {
+ return delegate.getPersistenceContextRefs();
+ }
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(
+ String name)
+ {
+ return delegate.getPersistenceUnitReferenceByName(name);
+ }
+ public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+ {
+ return delegate.getPersistenceUnitRefs();
+ }
+ public PoolConfigMetaData getPoolConfig()
+ {
+ return delegate.getPoolConfig();
+ }
+ public PortComponent getPortComponent()
+ {
+ return delegate.getPortComponent();
+ }
+ public LifecycleCallbacksMetaData getPostConstructs()
+ {
+ return delegate.getPostConstructs();
+ }
+ public LifecycleCallbacksMetaData getPreDestroys()
+ {
+ return delegate.getPreDestroys();
+ }
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(
+ String name)
+ {
+ return delegate.getResourceEnvironmentReferenceByName(name);
+ }
+ public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+ {
+ return delegate.getResourceEnvironmentReferences();
+ }
+ public ResourceReferenceMetaData getResourceReferenceByName(String name)
+ {
+ return delegate.getResourceReferenceByName(name);
+ }
+ public ResourceReferencesMetaData getResourceReferences()
+ {
+ return delegate.getResourceReferences();
+ }
+ public String getSecurityDomain()
+ {
+ return delegate.getSecurityDomain();
+ }
+ public SecurityIdentityMetaData getSecurityIdentity()
+ {
+ return delegate.getSecurityIdentity();
+ }
+ public String getSecurityProxy()
+ {
+ return delegate.getSecurityProxy();
+ }
+ public SecurityRoleMetaData getSecurityRole(String roleName)
+ {
+ return delegate.getSecurityRole(roleName);
+ }
+ public Set<String> getSecurityRolePrincipals(String roleName)
+ {
+ return delegate.getSecurityRolePrincipals(roleName);
+ }
+ public SecurityRoleRefsMetaData getSecurityRoleRefs()
+ {
+ return delegate.getSecurityRoleRefs();
+ }
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return delegate.getServiceReferenceByName(name);
+ }
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ return delegate.getServiceReferences();
+ }
+ public TransactionManagementType getTransactionType()
+ {
+ return delegate.getTransactionType();
+ }
+ public int hashCode()
+ {
+ return delegate.hashCode();
+ }
+ public boolean hasMethodPermissions(String methodName, Class<?>[] params,
+ MethodInterfaceType interfaceType)
+ {
+ return delegate.hasMethodPermissions(methodName, params, interfaceType);
+ }
+ public boolean isBMT()
+ {
+ return delegate.isBMT();
+ }
+ public boolean isCMT()
+ {
+ return delegate.isCMT();
+ }
+ public boolean isConsumer()
+ {
+ return delegate.isConsumer();
+ }
+ public boolean isEntity()
+ {
+ return delegate.isEntity();
+ }
+ public boolean isExceptionOnRollback()
+ {
+ return delegate.isExceptionOnRollback();
+ }
+ public boolean isMessageDriven()
+ {
+ return delegate.isMessageDriven();
+ }
+ public boolean isMethodReadOnly(Method method)
+ {
+ return delegate.isMethodReadOnly(method);
+ }
+ public boolean isMethodReadOnly(String methodName)
+ {
+ return delegate.isMethodReadOnly(methodName);
+ }
+ public boolean isService()
+ {
+ return delegate.isService();
+ }
+ public boolean isSession()
+ {
+ return delegate.isSession();
+ }
+ public boolean isTimerPersistence()
+ {
+ return delegate.isTimerPersistence();
+ }
+
+}
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 2008-04-16 09:34:18 UTC (rev 72270)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2008-04-16 10:29:06 UTC (rev 72271)
@@ -217,6 +217,63 @@
assertEquals("en-session2-override", descGroup.getDescription());
}
+ /**
+ * There was a CCE during merge since every generic bean was assumed to be a session bean
+ */
+ public void testMdbGeneric() throws Exception
+ {
+ EjbJarMetaData ejbJarMetaData = unmarshal("EjbJarJBossMerge_MdbGeneric_ejb-jar.xml", EjbJar30MetaData.class, null);
+ JBossMetaData jbossMetaData = unmarshal("EjbJarJBossMerge_generic_jboss.xml", JBoss50MetaData.class, null);
+ // Create a merged view
+ JBossMetaData mergedMetaData = new JBossMetaData();
+ mergedMetaData.merge(jbossMetaData, ejbJarMetaData);
+
+ JBossEnterpriseBeansMetaData beans = mergedMetaData.getEnterpriseBeans();
+ assertNotNull(beans);
+ assertEquals(1, beans.size());
+ JBossEnterpriseBeanMetaData bean = beans.get("myEjbName");
+ assertNotNull(bean);
+ assertTrue(bean.isMessageDriven());
+ }
+
+ /**
+ * There was a CCE during merge since every generic bean was assumed to be a session bean
+ */
+ public void testSessionGeneric() throws Exception
+ {
+ EjbJarMetaData ejbJarMetaData = unmarshal("EjbJarJBossMerge_SessionGeneric_ejb-jar.xml", EjbJar30MetaData.class, null);
+ JBossMetaData jbossMetaData = unmarshal("EjbJarJBossMerge_generic_jboss.xml", JBoss50MetaData.class, null);
+ // Create a merged view
+ JBossMetaData mergedMetaData = new JBossMetaData();
+ mergedMetaData.merge(jbossMetaData, ejbJarMetaData);
+
+ JBossEnterpriseBeansMetaData beans = mergedMetaData.getEnterpriseBeans();
+ assertNotNull(beans);
+ assertEquals(1, beans.size());
+ JBossEnterpriseBeanMetaData bean = beans.get("myEjbName");
+ assertNotNull(bean);
+ assertTrue(bean.isSession());
+ }
+
+ /**
+ * There was a CCE during merge since every generic bean was assumed to be a session bean
+ */
+ public void testEntityGeneric() throws Exception
+ {
+ EjbJarMetaData ejbJarMetaData = unmarshal("EjbJarJBossMerge_EntityGeneric_ejb-jar.xml", EjbJar30MetaData.class, null);
+ JBossMetaData jbossMetaData = unmarshal("EjbJarJBossMerge_generic_jboss.xml", JBoss50MetaData.class, null);
+ // Create a merged view
+ JBossMetaData mergedMetaData = new JBossMetaData();
+ mergedMetaData.merge(jbossMetaData, ejbJarMetaData);
+
+ JBossEnterpriseBeansMetaData beans = mergedMetaData.getEnterpriseBeans();
+ assertNotNull(beans);
+ assertEquals(1, beans.size());
+ JBossEnterpriseBeanMetaData bean = beans.get("myEjbName");
+ assertNotNull(bean);
+ assertTrue(bean.isEntity());
+ }
+
public void testEJBLocalReferenceMerge() throws Exception
{
EJBLocalReferenceMetaData original = new EJBLocalReferenceMetaData();
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml 2008-04-16 10:29:06 UTC (rev 72271)
@@ -0,0 +1,16 @@
+<?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"
+ metadata-complete="true"
+ id="ejb-jar-id">
+
+ <enterprise-beans>
+ <entity>
+ <ejb-name>myEjbName</ejb-name>
+ </entity>
+ </enterprise-beans>
+
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_MdbGeneric_ejb-jar.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_MdbGeneric_ejb-jar.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_MdbGeneric_ejb-jar.xml 2008-04-16 10:29:06 UTC (rev 72271)
@@ -0,0 +1,16 @@
+<?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"
+ metadata-complete="true"
+ id="ejb-jar-id">
+
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>myEjbName</ejb-name>
+ </message-driven>
+ </enterprise-beans>
+
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_SessionGeneric_ejb-jar.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_SessionGeneric_ejb-jar.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_SessionGeneric_ejb-jar.xml 2008-04-16 10:29:06 UTC (rev 72271)
@@ -0,0 +1,16 @@
+<?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"
+ metadata-complete="true"
+ id="ejb-jar-id">
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>myEjbName</ejb-name>
+ </session>
+ </enterprise-beans>
+
+</ejb-jar>
\ No newline at end of file
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_generic_jboss.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_generic_jboss.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_generic_jboss.xml 2008-04-16 10:29:06 UTC (rev 72271)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jee="http://java.sun.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="5.0"
+ id="jboss-id">
+
+ <enterprise-beans>
+ <ejb>
+ <ejb-name>myEjbName</ejb-name>
+ </ejb>
+ </enterprise-beans>
+
+</jboss>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list