[jboss-cvs] JBossAS SVN: r66359 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/jboss and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 23 09:19:38 EDT 2007
Author: wolfc
Date: 2007-10-23 09:19:38 -0400 (Tue, 23 Oct 2007)
New Revision: 66359
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/OldMetaDataWithOverride.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeansMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMap.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferencesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImpl.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/MappedMetaDataWithDescriptions.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.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/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/javaee/AbstractJavaEEMetaDataTest.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
Log:
JBAS-4506: merge mustOverride behavior & generics
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -22,13 +22,12 @@
package org.jboss.metadata;
import java.lang.reflect.Method;
-import java.security.Principal;
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
+import org.jboss.invocation.InvocationType;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
import org.jboss.metadata.ejb.jboss.IORSecurityConfigMetaData;
import org.jboss.metadata.ejb.jboss.InvokerBindingMetaData;
@@ -42,7 +41,6 @@
import org.jboss.metadata.ejb.spec.MethodInterfaceType;
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
import org.jboss.metadata.ejb.spec.TransAttributeType;
-import org.jboss.invocation.InvocationType;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -73,7 +71,7 @@
* @version $Revision: 45953 $
*/
@Deprecated
-public abstract class BeanMetaData extends OldMetaDataWithOverride<JBossEnterpriseBeanMetaData, IEnterpriseBeanMetaData>
+public abstract class BeanMetaData extends OldMetaDataWithOverride<JBossEnterpriseBeanMetaData, EnterpriseBeanMetaData>
{
/** Session type */
public static final char SESSION_TYPE = 'S';
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/OldMetaDataWithOverride.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/OldMetaDataWithOverride.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/OldMetaDataWithOverride.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -32,6 +32,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("deprecation")
public class OldMetaDataWithOverride<T extends OverrideMetaData<O>, O> extends OldMetaData<T>
{
/** The overriden delegate */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -27,13 +27,11 @@
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
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.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
@@ -47,9 +45,9 @@
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.support.IdMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithOverride;
-import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
/**
* The jboss javaee client application metadata
@@ -266,13 +264,27 @@
return jndiEnvironmentRefsGroup.getResourceReferences();
}
+ @Override
+ public void merge(IdMetaData override, IdMetaData original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ @Override
+ public void merge(IdMetaDataImpl override, IdMetaDataImpl original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
/**
* Merge jboss + spec into this
* @param jboss
* @param spec
*/
- public void merge(JBossClientMetaData jboss, ApplicationClientMetaData spec)
+ public void merge(JBossClientMetaData jboss, ApplicationClientMetaData spec, boolean mustOverride)
{
+ super.merge(jboss, spec);
+
RemoteEnvironmentRefsGroupMetaData jbossEnv = null;
RemoteEnvironmentRefsGroupMetaData specEnv = null;
MessageDestinationsMetaData jbossMsgs = null;
@@ -298,7 +310,7 @@
this.setCallbackHandler(spec.getCallbackHandler());
jndiEnvironmentRefsGroup = new RemoteEnvironmentRefsGroupMetaData();
- jndiEnvironmentRefsGroup.merge(jbossEnv, specEnv);
+ jndiEnvironmentRefsGroup.merge(jbossEnv, specEnv, mustOverride);
messageDestinations = new MessageDestinationsMetaData();
messageDestinations.merge(jbossMsgs, specMsgs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEjbJarMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -27,7 +27,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public interface IEjbJarMetaData
+public interface IEjbJarMetaData<E extends IEnterpriseBeanMetaData<E>>
{
public String getVersion();
public void setVersion(String version);
@@ -37,9 +37,9 @@
public boolean isEJB3x();
public String getEjbClientJar();
public void setEjbClientJar(String ejbClientJar);
- public IEnterpriseBeansMetaData<?> getEnterpriseBeans();
- public IEnterpriseBeanMetaData getEnterpriseBean(String name);
- public void setEnterpriseBeans(IEnterpriseBeansMetaData<?> enterpriseBeans);
+ public IEnterpriseBeansMetaData<E> getEnterpriseBeans();
+ public IEnterpriseBeanMetaData<E> getEnterpriseBean(String name);
+ public void setEnterpriseBeans(IEnterpriseBeansMetaData<E> enterpriseBeans);
public RelationsMetaData getRelationships();
public void setRelationships(RelationsMetaData relationships);
public IAssemblyDescriptorMetaData getAssemblyDescriptor();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -59,12 +59,12 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public interface IEnterpriseBeanMetaData extends MappableMetaData
+public interface IEnterpriseBeanMetaData<E extends IEnterpriseBeanMetaData<E>> extends MappableMetaData
{
public String getId();
public DescriptionGroupMetaData getDescriptionGroup();
public void setDescriptionGroup(DescriptionGroupMetaData descriptionGroup);
- public IEjbJarMetaData getEjbJarMetaData();
+ public IEjbJarMetaData<E> getEjbJarMetaData();
public String getEjbName();
public void setEjbName(String ejbName);
public boolean isSession();
@@ -107,7 +107,7 @@
public InterceptorBindingMetaData getInterceptorBinding();;
public ExcludeListMetaData getExcludeList();
//public IEnterpriseBeansMetaData getEnterpriseBeansMetaData();
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> data);
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<E> data);
//
//public void merge(NamedMetaData merged, NamedMetaData original);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeansMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/ejb/IEnterpriseBeansMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -29,7 +29,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public interface IEnterpriseBeansMetaData<E extends IEnterpriseBeanMetaData>
+public interface IEnterpriseBeansMetaData<E extends IEnterpriseBeanMetaData<E>>
extends IdMetaData, Collection<E>
{
/**
@@ -37,14 +37,14 @@
*
* @return the ejbJarMetaData.
*/
- IEjbJarMetaData getEjbJarMetaData();
+ IEjbJarMetaData<E> getEjbJarMetaData();
/**
* Set the ejbJarMetaData.
*
* @param ejbJarMetaData the ejbJarMetaData.
* @throws IllegalArgumentException for a null ejbJarMetaData
*/
- void setEjbJarMetaData(IEjbJarMetaData ejbJarMetaData);
+ void setEjbJarMetaData(IEjbJarMetaData<E> ejbJarMetaData);
public E get(String ejbName);
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -73,6 +73,7 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+import org.jboss.metadata.javaee.support.NamedMetaData;
import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroupWithOverride;
import org.jboss.metadata.javaee.support.NonNullLinkedHashSet;
import org.jboss.xb.annotations.JBossXmlConstants;
@@ -96,9 +97,9 @@
@JBossXmlModelGroup.Particle(element=@XmlElement(name="message-driven"), type=JBossMessageDrivenBeanMetaData.class),
@JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb"), type=JBossGenericBeanMetaData.class),
@JBossXmlModelGroup.Particle(element=@XmlElement(name="service"), type=JBossServiceBeanMetaData.class)})
-public abstract class JBossEnterpriseBeanMetaData extends NamedMetaDataWithDescriptionGroupWithOverride<IEnterpriseBeanMetaData>
+public abstract class JBossEnterpriseBeanMetaData extends NamedMetaDataWithDescriptionGroupWithOverride<EnterpriseBeanMetaData>
implements Environment,
- IEnterpriseBeanMetaData
+ IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = 6909774842926430193L;
@@ -205,7 +206,7 @@
*
* @return the enterpriseBeansMetaData.
*/
- public IEnterpriseBeansMetaData<?> getEnterpriseBeansMetaData()
+ public IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> getEnterpriseBeansMetaData()
{
return enterpriseBeansMetaData;
}
@@ -215,7 +216,8 @@
*
* @param enterpriseBeansMetaData the enterpriseBeansMetaData.
*/
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ @XmlTransient
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> enterpriseBeansMetaData)
{
assert enterpriseBeansMetaData != null : "enterpriseBeansMetaData is null";
@@ -262,6 +264,8 @@
@XmlElement(type=JBossEnvironmentRefsGroupMetaData.class)
public void setJndiEnvironmentRefsGroup(EnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
{
+ if(this.jndiEnvironmentRefsGroup != null)
+ throw new IllegalArgumentException("jndiEnvironmentRefsGroup already set");
this.jndiEnvironmentRefsGroup = (JBossEnvironmentRefsGroupMetaData) jndiEnvironmentRefsGroup;
}
@@ -291,7 +295,8 @@
return ejbClass;
}
- public IEjbJarMetaData getEjbJarMetaData()
+ @XmlTransient
+ public IEjbJarMetaData<JBossEnterpriseBeanMetaData> getEjbJarMetaData()
{
return enterpriseBeansMetaData.getEjbJarMetaData();
}
@@ -319,7 +324,7 @@
* @param iface the interface type
* @return the method transaction type
*/
- public TransAttributeType getMethodTransactionType(String methodName, Class[] params, MethodInterfaceType iface)
+ public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
{
// default value
TransAttributeType result = null;
@@ -1088,11 +1093,11 @@
* @param interfaceType the interface type
* @return The Set<String> for the application domain roles that caller principal's are to be validated against.
*/
- public Set<String> getMethodPermissions(String methodName, Class[] params, MethodInterfaceType interfaceType)
+ public Set<String> getMethodPermissions(String methodName, Class<?>[] params, MethodInterfaceType interfaceType)
{
Set<String> result = null;
- IEnterpriseBeanMetaData ejb = getOverridenMetaDataWithCheck();
+ IEnterpriseBeanMetaData<EnterpriseBeanMetaData> ejb = getOverridenMetaDataWithCheck();
JBossMetaData jbossMetaData = getJBossMetaDataWithCheck();
// First check the excluded method list as this takes priority over
@@ -1169,9 +1174,9 @@
* @param interfaceType - the method interface type
* @return true if a matching method permission exists, false if no match
*/
- public boolean hasMethodPermissions(String methodName, Class[] params, MethodInterfaceType interfaceType)
+ public boolean hasMethodPermissions(String methodName, Class<?>[] params, MethodInterfaceType interfaceType)
{
- IEnterpriseBeanMetaData ejb = getOverridenMetaDataWithCheck();
+ IEnterpriseBeanMetaData<EnterpriseBeanMetaData> ejb = getOverridenMetaDataWithCheck();
// First check the excluded method list as this takes priority over
// all other assignments
@@ -1338,8 +1343,15 @@
this.securityIdentity = securityIdentity;
}
- public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+ @Override
+ public void merge(NamedMetaData override, NamedMetaData original)
{
+ throw new RuntimeException("wrong merge method called");
+ }
+
+ public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original, String overridenFile, String overrideFile, boolean mustOverride)
+ {
+ super.merge(override, original);
if(override != null && override.getEjbClass() != null)
setEjbClass(override.getEjbClass());
else if(original.getEjbClass() != null)
@@ -1389,7 +1401,7 @@
resourceMgrs = resourceMgrsOverride;
jenv = override.jndiEnvironmentRefsGroup;
}
- jndiEnvironmentRefsGroup.merge(jenv, env, resourceMgrs);
+ jndiEnvironmentRefsGroup.merge(jenv, env, resourceMgrs, overridenFile, overrideFile, mustOverride);
// Fixup the invoker binding references on ejb refs
InvokerBindingsMetaData invokerBindings = getInvokerBindings();
@@ -1427,7 +1439,7 @@
*/
protected IAssemblyDescriptorMetaData getAssemblyDescriptor()
{
- IEjbJarMetaData ejbJar = getEjbJarMetaData();
+ IEjbJarMetaData<JBossEnterpriseBeanMetaData> ejbJar = getEjbJarMetaData();
if (ejbJar == null)
return null;
return ejbJar.getAssemblyDescriptor();
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeansMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,16 +21,17 @@
*/
package org.jboss.metadata.ejb.jboss;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.common.javaee.ejb.IEjbJarMetaData;
-import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeansMap;
import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
+import org.jboss.metadata.javaee.support.IdMetaData;
/**
* JBossEnterpriseBeansMetaData.
@@ -56,7 +57,7 @@
{
}
- public JBossEnterpriseBeanMetaData createOverride(IEnterpriseBeanMetaData data)
+ public JBossEnterpriseBeanMetaData createOverride(EnterpriseBeanMetaData data)
{
if (data == null)
throw new IllegalArgumentException("Null data");
@@ -102,23 +103,32 @@
throw new RuntimeException("NYI");
}
- public IEjbJarMetaData getEjbJarMetaData()
+ public IEjbJarMetaData<JBossEnterpriseBeanMetaData> getEjbJarMetaData()
{
return jbossMetaData;
}
- public void setEjbJarMetaData(IEjbJarMetaData ejbJarMetaData)
+ @XmlTransient
+ public void setEjbJarMetaData(IEjbJarMetaData<JBossEnterpriseBeanMetaData> ejbJarMetaData)
{
jbossMetaData = (JBossMetaData) ejbJarMetaData;
}
+ @Override
+ public void merge(IdMetaData override, IdMetaData original)
+ {
+ throw new RuntimeException("wrong merge method called");
+ }
+
/**
* Merge override + original into this
* @param override
* @param original
*/
- public void merge(JBossEnterpriseBeansMetaData override, IEnterpriseBeansMetaData<EnterpriseBeanMetaData> original)
+ public void merge(JBossEnterpriseBeansMetaData override, IEnterpriseBeansMetaData<EnterpriseBeanMetaData> original,
+ String overridenFile, String overrideFile, boolean mustOverride)
{
+ super.merge(override, original);
// Add all override beans
if(original == null && override != null)
addAll(override);
@@ -138,7 +148,7 @@
if(mergedEJB == null)
mergedEJB = JBossEnterpriseBeanMetaData.newBean(ejb);
mergedEJB.setEnterpriseBeansMetaData(this);
- mergedEJB.merge(jejb, ejb);
+ mergedEJB.merge(jejb, ejb, overridenFile, overrideFile, mustOverride);
this.add(mergedEJB);
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -485,9 +485,9 @@
}
@Override
- public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+ public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original, String overridenFile, String overrideFile, boolean mustOverride)
{
- super.merge(override, original);
+ super.merge(override, original, overridenFile, overrideFile, mustOverride);
JBossEntityBeanMetaData joverride = (JBossEntityBeanMetaData) override;
EntityBeanMetaData soriginal = (EntityBeanMetaData) original;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,7 +21,6 @@
*/
package org.jboss.metadata.ejb.jboss;
-import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
@@ -55,7 +54,7 @@
// This is only here because historically this was mixed in the environment xml
private SecurityIdentityMetaData securityIdentity;
*/
-
+
/**
* Merge an environment
*
@@ -65,106 +64,15 @@
* @param overrideFile the override file
* @return the merged environment
*/
- public static JBossEnvironmentRefsGroupMetaData merge(JBossEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
+ public static JBossEnvironmentRefsGroupMetaData mergeNew(JBossEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
EnvironmentRefsGroupMetaData environmentRefsGroup,
ResourceManagersMetaData resourceMgrs,
- String overridenFile, String overrideFile)
+ String overridenFile, String overrideFile, boolean mustOverride)
{
JBossEnvironmentRefsGroupMetaData merged = new JBossEnvironmentRefsGroupMetaData();
- if (jbossEnvironmentRefsGroup == null && environmentRefsGroup == null)
- return merged;
-
- EnvironmentEntriesMetaData envEntries = null;
- EJBReferencesMetaData ejbRefs = null;
- EJBReferencesMetaData jbossEjbRefs = null;
- EJBLocalReferencesMetaData ejbLocalRefs = null;
- EJBLocalReferencesMetaData jbossEjbLocalRefs = null;
- ResourceReferencesMetaData resRefs = null;
- ResourceReferencesMetaData jbossResRefs = null;
- ResourceEnvironmentReferencesMetaData resEnvRefs = null;
- ResourceEnvironmentReferencesMetaData jbossResEnvRefs = null;
- MessageDestinationReferencesMetaData messageDestinationRefs = null;
- MessageDestinationReferencesMetaData jbossMessageDestinationRefs = null;
- PersistenceContextReferencesMetaData persistenceContextRefs = null;
- PersistenceUnitReferencesMetaData persistenceUnitRefs = null;
- LifecycleCallbacksMetaData postConstructs = null;
- LifecycleCallbacksMetaData preDestroys = null;
+ merged.merge(jbossEnvironmentRefsGroup, environmentRefsGroup, resourceMgrs, overridenFile, overrideFile, mustOverride);
- if (environmentRefsGroup != null)
- {
- envEntries = environmentRefsGroup.getEnvironmentEntries();
- ejbRefs = environmentRefsGroup.getEjbReferences();
- ejbLocalRefs = environmentRefsGroup.getEjbLocalReferences();
- // ServiceRefs
- resRefs = environmentRefsGroup.getResourceReferences();
- resEnvRefs = environmentRefsGroup.getResourceEnvironmentReferences();
- messageDestinationRefs = environmentRefsGroup.getMessageDestinationReferences();
- persistenceContextRefs = environmentRefsGroup.getPersistenceContextRefs();
- persistenceUnitRefs = environmentRefsGroup.getPersistenceUnitRefs();
- postConstructs = environmentRefsGroup.getPostConstructs();
- preDestroys = environmentRefsGroup.getPreDestroys();
- }
-
- if (jbossEnvironmentRefsGroup != null)
- {
- jbossEjbRefs = jbossEnvironmentRefsGroup.getEjbReferences();
- jbossEjbLocalRefs = jbossEnvironmentRefsGroup.getEjbLocalReferences();
- jbossResRefs = jbossEnvironmentRefsGroup.getResourceReferences();
- jbossResEnvRefs = jbossEnvironmentRefsGroup.getResourceEnvironmentReferences();
- jbossMessageDestinationRefs = jbossEnvironmentRefsGroup.getMessageDestinationReferences();
- }
-
- EJBReferencesMetaData mergedEjbRefs = EJBReferencesMetaData.merge(jbossEjbRefs, ejbRefs, overridenFile, overrideFile);
- if (mergedEjbRefs != null)
- merged.setEjbReferences(mergedEjbRefs);
-
- EJBLocalReferencesMetaData mergedEjbLocalRefs = EJBLocalReferencesMetaData.merge(jbossEjbLocalRefs, ejbLocalRefs, overridenFile, overrideFile);
- if (mergedEjbLocalRefs != null)
- merged.setEjbLocalReferences(mergedEjbLocalRefs);
-
- // Need to set the jndi name from resource mgr if referenced
- if(jbossResRefs != null && resourceMgrs != null)
- {
- for(ResourceReferenceMetaData ref : jbossResRefs)
- {
- ResourceManagerMetaData mgr = resourceMgrs.get(ref.getResourceName());
- if(mgr != null)
- {
- if(mgr.getResJndiName() != null)
- ref.setJndiName(mgr.getResJndiName());
- else if(mgr.getResUrl() != null)
- ref.setResUrl(mgr.getResUrl());
- }
- }
- }
- ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile);
- if (mergedResRefs != null)
- merged.setResourceReferences(mergedResRefs);
-
- ResourceEnvironmentReferencesMetaData mergedResEnvRefs = ResourceEnvironmentReferencesMetaData.merge(jbossResEnvRefs, resEnvRefs, overridenFile, overrideFile);
- if (mergedResEnvRefs != null)
- merged.setResourceEnvironmentReferences(mergedResEnvRefs);
-
- MessageDestinationReferencesMetaData mergedMessageDestinationRefs = MessageDestinationReferencesMetaData.merge(jbossMessageDestinationRefs, messageDestinationRefs, overridenFile, overrideFile);
- if (mergedMessageDestinationRefs != null)
- merged.setMessageDestinationReferences(mergedMessageDestinationRefs);
-
- if (envEntries != null)
- merged.setEnvironmentEntries(envEntries);
-
- if (persistenceContextRefs != null)
- merged.setPersistenceContextRefs(persistenceContextRefs);
-
- if (persistenceUnitRefs != null)
- merged.setPersistenceUnitRefs(persistenceUnitRefs);
-
- if (postConstructs != null)
- merged.setPostConstructs(postConstructs);
-
- if (preDestroys != null)
- merged.setPreDestroys(preDestroys);
-
return merged;
}
@@ -179,7 +87,8 @@
*/
public void merge(JBossEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
EnvironmentRefsGroupMetaData environmentRefsGroup,
- ResourceManagersMetaData resourceMgrs)
+ ResourceManagersMetaData resourceMgrs,
+ String overridenFile, String overrideFile, boolean mustOverride)
{
if (jbossEnvironmentRefsGroup == null && environmentRefsGroup == null)
return;
@@ -233,11 +142,11 @@
jbossMessageDestinationRefs = this.getMessageDestinationReferences();
}
- EJBReferencesMetaData mergedEjbRefs = EJBReferencesMetaData.merge(jbossEjbRefs, ejbRefs, "ejb-jar.xml", "jboss.xml");
+ EJBReferencesMetaData mergedEjbRefs = EJBReferencesMetaData.merge(jbossEjbRefs, ejbRefs, overridenFile, overrideFile);
if (mergedEjbRefs != null)
this.setEjbReferences(mergedEjbRefs);
- EJBLocalReferencesMetaData mergedEjbLocalRefs = EJBLocalReferencesMetaData.merge(jbossEjbLocalRefs, ejbLocalRefs, "ejb-jar.xml", "jboss.xml");
+ EJBLocalReferencesMetaData mergedEjbLocalRefs = EJBLocalReferencesMetaData.merge(jbossEjbLocalRefs, ejbLocalRefs, overridenFile, overrideFile);
if (mergedEjbLocalRefs != null)
this.setEjbLocalReferences(mergedEjbLocalRefs);
@@ -256,15 +165,15 @@
}
}
}
- ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, "ejb-jar.xml", "jboss.xml");
+ ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile, mustOverride);
if (mergedResRefs != null)
this.setResourceReferences(mergedResRefs);
- ResourceEnvironmentReferencesMetaData mergedResEnvRefs = ResourceEnvironmentReferencesMetaData.merge(jbossResEnvRefs, resEnvRefs, "ejb-jar.xml", "jboss.xml");
+ ResourceEnvironmentReferencesMetaData mergedResEnvRefs = ResourceEnvironmentReferencesMetaData.merge(jbossResEnvRefs, resEnvRefs, overridenFile, overrideFile);
if (mergedResEnvRefs != null)
this.setResourceEnvironmentReferences(mergedResEnvRefs);
- MessageDestinationReferencesMetaData mergedMessageDestinationRefs = MessageDestinationReferencesMetaData.merge(jbossMessageDestinationRefs, messageDestinationRefs, "ejb-jar.xml", "jboss.xml");
+ MessageDestinationReferencesMetaData mergedMessageDestinationRefs = MessageDestinationReferencesMetaData.merge(jbossMessageDestinationRefs, messageDestinationRefs, overridenFile, overrideFile);
if (mergedMessageDestinationRefs != null)
this.setMessageDestinationReferences(mergedMessageDestinationRefs);
@@ -283,5 +192,4 @@
if (preDestroys != null)
this.setPreDestroys(preDestroys);
}
-
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMessageDrivenBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,6 +21,10 @@
*/
package org.jboss.metadata.ejb.jboss;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
import org.jboss.metadata.ejb.spec.ActivationConfigMetaData;
import org.jboss.metadata.ejb.spec.AroundInvokesMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -28,12 +32,7 @@
import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
import org.jboss.metadata.ejb.spec.SubscriptionDurability;
-import org.jboss.metadata.ejb.spec.TransactionType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
/**
* MessageDrivenBeanMetaData.
*
@@ -434,9 +433,9 @@
}
@Override
- public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+ public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original, String overridenFile, String overrideFile, boolean mustOverride)
{
- super.merge(override, original);
+ super.merge(override, original, overridenFile, overrideFile, mustOverride);
JBossMessageDrivenBeanMetaData joverride = (JBossMessageDrivenBeanMetaData) override;
MessageDrivenBeanMetaData soriginal = (MessageDrivenBeanMetaData) original;
// messagingType
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -45,7 +45,7 @@
* @version $Revision: 1.1 $
*/
public class JBossMetaData extends IdMetaDataImplWithDescriptionGroupWithOverride<org.jboss.metadata.ejb.spec.EjbJarMetaData>
- implements IEjbJarMetaData
+ implements IEjbJarMetaData<JBossEnterpriseBeanMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = 598759931857080298L;
@@ -176,9 +176,12 @@
{
return assemblyDescriptor;
}
+
@XmlElement(type=JBossAssemblyDescriptorMetaData.class)
public void setAssemblyDescriptor(IAssemblyDescriptorMetaData assemblyDescriptor)
{
+ if(this.assemblyDescriptor != null)
+ throw new IllegalArgumentException("assemblyDescriptor already set");
this.assemblyDescriptor = (JBossAssemblyDescriptorMetaData) assemblyDescriptor;
}
@@ -371,7 +374,7 @@
*
* @return the enterpriseBeans.
*/
- public IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> getEnterpriseBeans()
+ public IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> getEnterpriseBeans()
{
return enterpriseBeans;
}
@@ -384,7 +387,7 @@
*/
@JBossXmlCollection(type=JBossEnterpriseBeansMetaData.class)
@XmlElement(name="enterprise-beans")
- public void setEnterpriseBeans(IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> enterpriseBeans)
+ public void setEnterpriseBeans(IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> enterpriseBeans)
{
if (enterpriseBeans == null)
throw new IllegalArgumentException("Null enterpriseBeans");
@@ -398,7 +401,7 @@
* @param name the name
* @return the container configuration
*/
- public IEnterpriseBeanMetaData getEnterpriseBean(String name)
+ public IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> getEnterpriseBean(String name)
{
if (enterpriseBeans == null)
return null;
@@ -622,7 +625,8 @@
IEnterpriseBeansMetaData<EnterpriseBeanMetaData> beans = null;
if(original != null)
beans = original.getEnterpriseBeans();
- enterpriseBeans.merge(jbeans, beans);
+ boolean isEJB3x = (original == null || original.isEJB3x());
+ enterpriseBeans.merge(jbeans, beans, "ejb-jar.xml", "jboss.xml", !isEJB3x);
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.ejb.jboss;
+import org.jboss.metadata.common.javaee.ejb.IAssemblyDescriptorMetaData;
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
@@ -52,6 +53,12 @@
}
@Override
+ public IAssemblyDescriptorMetaData getAssemblyDescriptor()
+ {
+ return primary.getAssemblyDescriptor();
+ }
+
+ @Override
public ContainerConfigurationMetaData getContainerConfiguration(String name)
{
ContainerConfigurationMetaData ccmd = configurationsWrapper.get(name);
@@ -65,13 +72,13 @@
}
@Override
- public IEnterpriseBeanMetaData getEnterpriseBean(String name)
+ public IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> getEnterpriseBean(String name)
{
return primary.getEnterpriseBean(name);
}
@Override
- public IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> getEnterpriseBeans()
+ public IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> getEnterpriseBeans()
{
return primary.getEnterpriseBeans();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,12 +21,8 @@
*/
package org.jboss.metadata.ejb.jboss;
-import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-
/**
* An EJB 3 service bean.
*
@@ -109,17 +105,17 @@
//
- @Override
- @XmlTransient
- public SessionBeanMetaData getOverridenMetaData()
- {
- return getEmbedded();
- }
-
- @Override
- @XmlTransient
- public EnterpriseBeanMetaData getOverridenMetaDataWithCheck()
- {
- return getEmbedded();
- }
+// @Override
+// @XmlTransient
+// public SessionBeanMetaData getOverridenMetaData()
+// {
+// return getEmbedded();
+// }
+//
+// @Override
+// @XmlTransient
+// public EnterpriseBeanMetaData getOverridenMetaDataWithCheck()
+// {
+// return getEmbedded();
+// }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -496,9 +496,9 @@
}
@Override
- public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original)
+ public void merge(JBossEnterpriseBeanMetaData override, EnterpriseBeanMetaData original, String overridenFile, String overrideFile, boolean mustOverride)
{
- super.merge(override, original);
+ super.merge(override, original, overridenFile, overrideFile, mustOverride);
JBossSessionBeanMetaData joverride = (JBossSessionBeanMetaData) override;
SessionBeanMetaData soriginal = (SessionBeanMetaData) original;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -28,7 +28,6 @@
import org.jboss.metadata.common.javaee.ejb.IEjbJarMetaData;
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeansMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
import org.jboss.xb.annotations.JBossXmlCollection;
@@ -39,7 +38,7 @@
* @version $Revision: 1.1 $
*/
public abstract class EjbJarMetaData extends IdMetaDataImplWithDescriptionGroup
- implements IEjbJarMetaData
+ implements IEjbJarMetaData<EnterpriseBeanMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = 809339942454480150L;
@@ -213,7 +212,7 @@
*/
@JBossXmlCollection(type=EnterpriseBeansMetaData.class)
@XmlElement(name="enterprise-beans")
- public void setEnterpriseBeans(IEnterpriseBeansMetaData enterpriseBeans)
+ public void setEnterpriseBeans(IEnterpriseBeansMetaData<EnterpriseBeanMetaData> enterpriseBeans)
{
if (enterpriseBeans == null)
throw new IllegalArgumentException("Null enterpriseBeans");
@@ -221,7 +220,7 @@
enterpriseBeans.setEjbJarMetaData(this);
}
- public IEnterpriseBeanMetaData getEnterpriseBean(String name)
+ public IEnterpriseBeanMetaData<EnterpriseBeanMetaData> getEnterpriseBean(String name)
{
return enterpriseBeans.get(name);
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -71,7 +71,7 @@
@JBossXmlModelGroup.Particle(element=@XmlElement(name="message-driven"), type=MessageDrivenBeanMetaData.class)})
public abstract class EnterpriseBeanMetaData extends NamedMetaDataWithDescriptionGroup
implements Environment,
- IEnterpriseBeanMetaData
+ IEnterpriseBeanMetaData<EnterpriseBeanMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = -10005320902508914L;
@@ -111,7 +111,7 @@
* @param enterpriseBeansMetaData the enterpriseBeansMetaData.
*/
@XmlTransient
- public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<?> enterpriseBeansMetaData)
+ public void setEnterpriseBeansMetaData(IEnterpriseBeansMetaData<EnterpriseBeanMetaData> enterpriseBeansMetaData)
{
this.enterpriseBeansMetaData = (EnterpriseBeansMetaData) enterpriseBeansMetaData;
}
@@ -122,7 +122,7 @@
* @return the ejbJarMetaData.
*/
@XmlTransient
- public IEjbJarMetaData getEjbJarMetaData()
+ public IEjbJarMetaData<EnterpriseBeanMetaData> getEjbJarMetaData()
{
if (enterpriseBeansMetaData == null)
return null;
@@ -136,7 +136,7 @@
*/
public IAssemblyDescriptorMetaData getAssemblyDescriptor()
{
- IEjbJarMetaData ejbJar = getEjbJarMetaData();
+ IEjbJarMetaData<EnterpriseBeanMetaData> ejbJar = getEjbJarMetaData();
if (ejbJar == null)
return null;
return ejbJar.getAssemblyDescriptor();
@@ -478,7 +478,7 @@
* @param iface the interface type
* @return the method transaction type
*/
- public TransAttributeType getMethodTransactionType(String methodName, Class[] params, MethodInterfaceType iface)
+ public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface)
{
// default value
TransAttributeType result = null;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMap.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMap.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMap.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -34,7 +34,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public abstract class EnterpriseBeansMap<T extends IEnterpriseBeanMetaData>
+public abstract class EnterpriseBeansMap<T extends IEnterpriseBeanMetaData<T>>
extends IdMetaDataImpl
implements IdMetaData, Collection<T>, IEnterpriseBeansMetaData<T>
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeansMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -57,7 +57,7 @@
*
* @return the ejbJarMetaData.
*/
- public IEjbJarMetaData getEjbJarMetaData()
+ public IEjbJarMetaData<EnterpriseBeanMetaData> getEjbJarMetaData()
{
return ejbJarMetaData;
}
@@ -69,7 +69,7 @@
* @throws IllegalArgumentException for a null ejbJarMetaData
*/
@XmlTransient
- public void setEjbJarMetaData(IEjbJarMetaData ejbJarMetaData)
+ public void setEjbJarMetaData(IEjbJarMetaData<EnterpriseBeanMetaData> ejbJarMetaData)
{
if (ejbJarMetaData == null)
throw new IllegalArgumentException("Null ejbJarMetaData");
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -37,7 +37,7 @@
* JBoss specifics for remote references.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@JBossXmlModelGroup(name="jndiEnvironmentRefsGroup",
propOrder={
@@ -55,7 +55,7 @@
private static final long serialVersionUID = 1L;
public static JBossRemoteEnvironmentRefsGroupMetaData merge(JBossRemoteEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
- RemoteEnvironment environmentRefsGroup, String overridenFile, String overrideFile)
+ RemoteEnvironment environmentRefsGroup, String overridenFile, String overrideFile, boolean mustOverride)
{
JBossRemoteEnvironmentRefsGroupMetaData merged = new JBossRemoteEnvironmentRefsGroupMetaData();
@@ -107,7 +107,7 @@
if (mergedServiceRefs != null)
merged.setServiceReferences(mergedServiceRefs);
- ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile);
+ ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile, mustOverride);
if (mergedResRefs != null)
merged.setResourceReferences(mergedResRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -324,7 +324,7 @@
return AbstractMappedMetaData.getByName(name, serviceReferences);
}
- public void merge(RemoteEnvironmentRefsGroupMetaData jbossEnv, RemoteEnvironmentRefsGroupMetaData specEnv)
+ public void merge(RemoteEnvironmentRefsGroupMetaData jbossEnv, RemoteEnvironmentRefsGroupMetaData specEnv, boolean mustOverride)
{
EnvironmentEntriesMetaData envEntries = null;
EJBReferencesMetaData ejbRefs = null;
@@ -371,7 +371,7 @@
if (mergedServiceRefs != null)
setServiceReferences(mergedServiceRefs);
- ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, "", "");
+ ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, "", "", mustOverride);
if (mergedResRefs != null)
setResourceReferences(mergedResRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferencesMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceReferencesMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -44,7 +44,7 @@
* @param overrideFile the override file
* @return the merged referencees
*/
- public static ResourceReferencesMetaData merge(ResourceReferencesMetaData override, ResourceReferencesMetaData overriden, String overridenFile, String overrideFile)
+ public static ResourceReferencesMetaData merge(ResourceReferencesMetaData override, ResourceReferencesMetaData overriden, String overridenFile, String overrideFile, boolean mustOverride)
{
if (override == null && overriden == null)
return null;
@@ -53,7 +53,7 @@
return overriden;
ResourceReferencesMetaData merged = new ResourceReferencesMetaData();
- return JavaEEMetaDataUtil.merge(merged, overriden, override, "resource-ref", overridenFile, overrideFile, true);
+ return JavaEEMetaDataUtil.merge(merged, overriden, override, "resource-ref", overridenFile, overrideFile, mustOverride);
}
/**
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImpl.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImpl.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/IdMetaDataImpl.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -73,6 +73,14 @@
}
}
+ public void merge(IdMetaData override, IdMetaData original)
+ {
+ if (override != null && override.getId() != null)
+ setId(override.getId());
+ else if (original != null && original.getId() != null)
+ setId(original.getId());
+ }
+
/**
* Merge the contents of override with original into this.
*
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/MappedMetaDataWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/MappedMetaDataWithDescriptions.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/MappedMetaDataWithDescriptions.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -66,13 +66,10 @@
* Get the metadata for the given key
*
* @param key the key
- * @return the key
- * @throws IllegalArgumentException for a null key
+ * @return the metadata for the given key, or <tt>null</tt> if the map contains no mapping for this key
*/
public T get(String key)
{
- if (key == null)
- throw new IllegalArgumentException("No " + keyName);
return map.get(key);
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/NamedMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -105,9 +105,9 @@
public void merge(NamedMetaData override, NamedMetaData original)
{
super.merge(override, original);
- if (override.name != null)
+ if (override != null && override.name != null)
setName(override.name);
- else if (original.name != null)
+ else if (original != null && original.name != null)
setName(original.name);
else
throw new IllegalStateException("Neither the override metadata " + override + " or the original " + original + " have a name.");
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -44,11 +44,13 @@
{
JBossMetaData merged = new JBossMetaData();
merged.merge(jboss, spec);
- merged.setOverridenMetaData(spec);
+ if(spec != null)
+ merged.setOverridenMetaData(spec);
return merged;
}
+
public static RemoteEnvironmentRefsGroupMetaData merge(RemoteEnvironmentRefsGroupMetaData jbossEnvironmentRefsGroup,
- RemoteEnvironment environmentRefsGroup, String overridenFile, String overrideFile)
+ RemoteEnvironment environmentRefsGroup, String overridenFile, String overrideFile, boolean mustOverride)
{
RemoteEnvironmentRefsGroupMetaData merged = new RemoteEnvironmentRefsGroupMetaData();
@@ -100,7 +102,7 @@
if (mergedServiceRefs != null)
merged.setServiceReferences(mergedServiceRefs);
- ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile);
+ ResourceReferencesMetaData mergedResRefs = ResourceReferencesMetaData.merge(jbossResRefs, resRefs, overridenFile, overrideFile, mustOverride);
if (mergedResRefs != null)
merged.setResourceReferences(mergedResRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -543,11 +543,11 @@
try
{
- mergedEnvironment = JBossEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup,
+ mergedEnvironment = JBossEnvironmentRefsGroupMetaData.mergeNew(jndiEnvironmentRefsGroup,
this.getOverridenMetaData().getJndiEnvironmentRefsGroup(),
// jboss-web does not use resource-managers
null,
- "web.xml", "jboss-web.xml");
+ "web.xml", "jboss-web.xml", true);
}
catch (Exception e)
{
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2007-10-23 13:19:38 UTC (rev 66359)
@@ -915,26 +915,16 @@
<xsd:sequence>
<xsd:element name="ejb-name" type="javaee:ejb-nameType"/>
+ <xsd:element name="mapped-name" type="javaee:xsdStringType" minOccurs="0"/>
+ <xsd:group ref="jboss:jndiEnvironmentRefsGroup"/>
+ <xsd:element name="ior-security-config" type="jboss:ior-security-config-type" minOccurs="0"/>
+ <xsd:element name="security-identity" type="javaee:security-identityType" minOccurs="0"/>
<xsd:element name="remote-binding" type="jboss:remote-bindingType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
<xsd:element name="call-by-value" type="xsd:boolean" minOccurs="0"/>
<xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
<xsd:element name="local-home-jndi-name" type="javaee:jndi-nameType" minOccurs="0"/>
- <xsd:element name="ejb-ref" type="jboss:ejb-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="ejb-local-ref" type="jboss:ejb-local-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="service-ref" type="jboss:jboss-service-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="ior-security-config" type="jboss:ior-security-config-type" minOccurs="0"/>
- <xsd:element name="security-identity" type="javaee:security-identityType" minOccurs="0"/>
- <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref" type="jboss:message-destination-refType"
- minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="clustered" type="jboss:clusteredType" minOccurs="0"/>
<xsd:element name="cluster-config" type="jboss:cluster-configType" minOccurs="0"/>
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClientJBossMergeEverythingUnitTestCase.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -85,7 +85,7 @@
new JBossClient5EverythingUnitTestCase("jbossClient").assertEverything(rawJBossMetaData);
JBossClientMetaData jbossClientMetaData = new JBossClientMetaData();
- jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData);
+ jbossClientMetaData.merge(rawJBossMetaData, appClientMetaData, true);
// TODO: should this work?
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -25,12 +25,10 @@
import org.jboss.metadata.common.javaee.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBoss50MetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
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.SessionBeanMetaData;
-import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -76,7 +74,7 @@
jbossMetaData.setOverridenMetaData(ejbJarMetaData);
- IEnterpriseBeanMetaData ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
+ IEnterpriseBeanMetaData<?> ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
assertNotNull(ejb);
ejbJar.assertFullSessionBean("session1", (SessionBeanMetaData) ejb);
}
@@ -96,7 +94,7 @@
jbossMetaData.setOverridenMetaData(ejbJarMetaData);
- IEnterpriseBeanMetaData ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
+ IEnterpriseBeanMetaData<?> ejb = jbossMetaData.getEnterpriseBean("session1EjbName");
assertNotNull(ejb);
ejbJar.assertFullSessionBean("session1", (SessionBeanMetaData) ejb);
}
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -64,6 +64,7 @@
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metadata.javaee.spec.RunAsMetaData;
+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;
@@ -157,15 +158,41 @@
sessionBean.setEjbName("MyStatelessBean");
ejbJar.getEnterpriseBeans().add(sessionBean);
- JBossMetaData result = unmarshal();
- result.setOverridenMetaData(ejbJar);
+ JBossMetaData jboss = unmarshal();
- assertEquals(1, result.getEnterpriseBeans().size());
- JBossGenericBeanMetaData bean = (JBossGenericBeanMetaData) result.getEnterpriseBean("MyStatelessBean");
- System.out.println(bean.getResourceReferences());
+ assertEquals(1, jboss.getEnterpriseBeans().size());
+
+ // create a merged view
+ JBossMetaData merged = MergeUtil.merge(jboss, ejbJar);
+ assertNotNull(merged.getEnterpriseBeans());
+// JBossGenericBeanMetaData bean = (JBossGenericBeanMetaData) merged.getEnterpriseBean("MyStatelessBean");
+ JBossSessionBeanMetaData bean = (JBossSessionBeanMetaData) merged.getEnterpriseBean("MyStatelessBean");
+ assertEquals(1, bean.getResourceReferences().size());
+ ResourceReferenceMetaData ref = bean.getResourceReferenceByName("qFactory");
+ assertNotNull(ref);
+ assertEquals("ConnectionFactory", ref.getJndiName());
}
/**
+ * EJBTHREE-936: allow for an unknown bean type
+ */
+ public void testEjbthree936WithoutScanner() throws Exception
+ {
+ JBossMetaData jboss = unmarshal("JBoss50_testEjbthree936.xml", JBossMetaData.class);
+
+ assertEquals(1, jboss.getEnterpriseBeans().size());
+
+ // create a merged view
+ JBossMetaData merged = MergeUtil.merge(jboss, null);
+ assertNotNull(merged.getEnterpriseBeans());
+ JBossGenericBeanMetaData bean = (JBossGenericBeanMetaData) merged.getEnterpriseBean("MyStatelessBean");
+ assertEquals(1, bean.getResourceReferences().size());
+ ResourceReferenceMetaData ref = bean.getResourceReferenceByName("qFactory");
+ assertNotNull(ref);
+ assertEquals("ConnectionFactory", ref.getJndiName());
+ }
+
+ /**
* A test for resource-adapter-name (ejb3 jca/inflow unit test)
*/
public void testResourceAdapterName() throws Exception
@@ -173,7 +200,7 @@
JBossMetaData result = unmarshal();
assertEquals(1, result.getEnterpriseBeans().size());
- IEnterpriseBeanMetaData bean = result.getEnterpriseBean("TestMDB");
+ IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> bean = result.getEnterpriseBean("TestMDB");
assertNotNull(bean);
assertTrue(bean instanceof JBossMessageDrivenBeanMetaData);
assertEquals("jcainflow.rar", ((JBossMessageDrivenBeanMetaData) bean).getResourceAdapterName());
@@ -189,7 +216,7 @@
JBossMetaData result = unmarshal();
assertEquals(1, result.getEnterpriseBeans().size());
- IEnterpriseBeanMetaData bean = result.getEnterpriseBean("StatefulOverrideBean");
+ IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> bean = result.getEnterpriseBean("StatefulOverrideBean");
assertNotNull(bean);
assertTrue(bean instanceof JBossSessionBeanMetaData);
assertEquals("StatefulOverride", ((JBossSessionBeanMetaData) bean).getJndiName());
@@ -209,18 +236,19 @@
assertNotNull(bean);
assertEquals("ServiceSix", bean.getEjbName());
- // The bean must have a 'copy' inside the overriden metadata
- SessionBeanMetaData overriden = bean.getOverridenMetaData();
- assertNotNull(overriden);
- assertEquals("ServiceSix", overriden.getEjbName());
+// // The bean must have a 'copy' inside the overriden metadata
+// SessionBeanMetaData overriden = bean.getOverridenMetaData();
+// assertNotNull(overriden);
+// assertEquals("ServiceSix", overriden.getEjbName());
- System.out.println(bean.getDescriptionGroup().getDescription());
+ getLog().info(bean.getDescriptionGroup().getDescription());
- assertEquals(1, overriden.getBusinessLocals().size());
- assertTrue(overriden.getBusinessLocals().contains("org.jboss.ejb3.test.service.ServiceSixLocal"));
+ System.out.println(bean.getEmbedded().getBusinessLocals());
+ assertEquals(1, bean.getBusinessLocals().size());
+ assertTrue(bean.getBusinessLocals().contains("org.jboss.ejb3.test.service.ServiceSixLocal"));
// TODO: I shouldn't have to reference via embedded
- SecurityIdentityMetaData securityIdentity = bean.getEmbedded().getSecurityIdentity();
+ SecurityIdentityMetaData securityIdentity = bean.getSecurityIdentity();
assertNotNull(securityIdentity);
RunAsMetaData runAs = securityIdentity.getRunAs();
assertNotNull(runAs);
@@ -290,10 +318,10 @@
// Test the unified metadata
InvokerProxyBindingsMetaData bindings = wrapper.getInvokerProxyBindings();
- IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> beans = wrapper.getEnterpriseBeans();
- IEnterpriseBeanMetaData session1Ejb = beans.get("session1EjbName");
+ IEnterpriseBeansMetaData<?> beans = wrapper.getEnterpriseBeans();
+ IEnterpriseBeanMetaData<?> session1Ejb = beans.get("session1EjbName");
assertNotNull(session1Ejb);
- for(IEnterpriseBeanMetaData bean : beans)
+ for(IEnterpriseBeanMetaData<?> bean : beans)
{
JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) bean;
ContainerConfigurationMetaData beanCfg = jbean.determineContainerConfiguration();
@@ -365,10 +393,10 @@
// Test the unified metadata view using the wrapper
InvokerProxyBindingsMetaData bindings = wrapper.getInvokerProxyBindings();
- IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> beans = wrapper.getEnterpriseBeans();
- IEnterpriseBeanMetaData sessionBean = beans.get("StatelessSessionBean");
+ IEnterpriseBeansMetaData<?> beans = wrapper.getEnterpriseBeans();
+ IEnterpriseBeanMetaData<?> sessionBean = beans.get("StatelessSessionBean");
assertNotNull(sessionBean);
- for(IEnterpriseBeanMetaData bean : beans)
+ for(IEnterpriseBeanMetaData<?> bean : beans)
{
JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) bean;
ContainerConfigurationMetaData beanCfg = jbean.determineContainerConfiguration();
@@ -415,7 +443,7 @@
assertNotNull(imd);
// Validate the merged StrictlyPooledMDB
- IEnterpriseBeanMetaData strictlyPooledMDB = beans.get("StrictlyPooledMDB");
+ IEnterpriseBeanMetaData<?> strictlyPooledMDB = beans.get("StrictlyPooledMDB");
JBossMessageDrivenBeanMetaData strictlyPooledMDBMD = (JBossMessageDrivenBeanMetaData) strictlyPooledMDB;
MessageDrivenBeanMetaData strictlyPooledSpecMD = strictlyPooledMDBMD.getOverridenMetaData();
assertNotNull("strictlyPooledMDB", strictlyPooledMDB);
@@ -490,7 +518,7 @@
assertEquals("topic/testTopic", tmgr.getResJndiName());
- IEnterpriseBeanMetaData mdb = jbossMetaData.getEnterpriseBean("TopicPublisher");
+ IEnterpriseBeanMetaData<?> mdb = jbossMetaData.getEnterpriseBean("TopicPublisher");
ResourceReferencesMetaData resources = mdb.getResourceReferences();
ResourceReferenceMetaData jmsRef1 = resources.get("jms/MyTopicConnection");
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss5xEverythingUnitTestCase.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -56,6 +56,7 @@
import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
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.EntityBeanMetaData;
import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
@@ -373,7 +374,7 @@
private void assertJBossEnterpriseBeans(JBossMetaData jbossMetaData)
{
- IEnterpriseBeansMetaData enterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
+ IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> enterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
assertNotNull(enterpriseBeansMetaData);
assertEquals(9, enterpriseBeansMetaData.size());
@@ -395,21 +396,21 @@
EjbJarMetaData ejbJarMetaData = jbossMetaData.getOverridenMetaData();
assertNotNull(ejbJarMetaData);
- IEnterpriseBeansMetaData enterpriseBeansMetaData = ejbJarMetaData.getEnterpriseBeans();
+ IEnterpriseBeansMetaData<EnterpriseBeanMetaData> enterpriseBeansMetaData = ejbJarMetaData.getEnterpriseBeans();
if (enterpriseBeansMetaData == null)
{
enterpriseBeansMetaData = new EnterpriseBeansMetaData();
ejbJarMetaData.setEnterpriseBeans(enterpriseBeansMetaData);
}
- IEnterpriseBeansMetaData<? extends IEnterpriseBeanMetaData> jbossEnterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
- for (IEnterpriseBeanMetaData jbossEnterpriseBeanMetaData : jbossEnterpriseBeansMetaData)
+ IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> jbossEnterpriseBeansMetaData = jbossMetaData.getEnterpriseBeans();
+ for (JBossEnterpriseBeanMetaData jbossEnterpriseBeanMetaData : jbossEnterpriseBeansMetaData)
{
JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) jbossEnterpriseBeanMetaData;
String name = jbossEnterpriseBeanMetaData.getEjbName();
if (enterpriseBeansMetaData.get(name) == null)
{
- IEnterpriseBeanMetaData enterpriseBeanMetaData = null;
+ EnterpriseBeanMetaData enterpriseBeanMetaData = null;
if (jbossEnterpriseBeanMetaData instanceof JBossSessionBeanMetaData)
enterpriseBeanMetaData = new SessionBeanMetaData();
else if (jbossEnterpriseBeanMetaData instanceof JBossEntityBeanMetaData)
@@ -422,7 +423,7 @@
}
}
- for (IEnterpriseBeanMetaData enterpriseBean : jbossMetaData.getEnterpriseBeans())
+ for (IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> enterpriseBean : jbossMetaData.getEnterpriseBeans())
fixUpEnterpriseBean(enterpriseBean);
}
@@ -451,16 +452,16 @@
assertFullMessageDrivenBean("mdb2", application, false);
}
*/
- private void fixUpEnterpriseBean(IEnterpriseBeanMetaData jbossEjb)
+ private void fixUpEnterpriseBean(IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> jbossEjb)
{
JBossEnterpriseBeanMetaData jbean = (JBossEnterpriseBeanMetaData) jbossEjb;
- IEnterpriseBeanMetaData ejb = jbean.getOverridenMetaData();
+ EnterpriseBeanMetaData ejb = jbean.getOverridenMetaData();
fixUpEnvironment(ejb, jbean);
}
private <T extends JBossEnterpriseBeanMetaData> T assertJBossEnterpriseBean(String prefix, JBossMetaData jBossMetaData, Class<T> expected)
{
- IEnterpriseBeanMetaData ejb = jBossMetaData.getEnterpriseBean(prefix + "EjbName");
+ IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> ejb = jBossMetaData.getEnterpriseBean(prefix + "EjbName");
assertNotNull(ejb);
assertEquals(prefix + "EjbName", ejb.getEjbName());
assertTrue(expected.isInstance(ejb));
@@ -1376,7 +1377,7 @@
assertEquals(prefix + "JndiName", messageDestinationMetaData.getMappedName());
}
- protected void fixUpEnvironment(IEnterpriseBeanMetaData ejb, JBossEnterpriseBeanMetaData jbossEjb)
+ protected void fixUpEnvironment(EnterpriseBeanMetaData ejb, JBossEnterpriseBeanMetaData jbossEjb)
{
EnvironmentRefsGroupMetaData jbossEjbEnvironment = jbossEjb.getJndiEnvironmentRefsGroup();
if (jbossEjbEnvironment == null)
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 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEMetaDataTest.java 2007-10-23 13:19:38 UTC (rev 66359)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.metadata.javaee;
-import java.lang.annotation.Annotation;
import java.net.URL;
import javax.xml.bind.annotation.XmlType;
@@ -30,7 +29,6 @@
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
-
import org.jboss.xb.annotations.JBossXmlConstants;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
@@ -92,7 +90,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new JavaEEMetaDataTestDelegate(clazz);
}
@@ -171,6 +169,20 @@
}
/**
+ * Unmarshall some xml.
+ *
+ * @param <T> the expected type
+ * @param name the file name
+ * @param expected the expected type
+ * @return the unmarshalled object
+ * @throws Exception for any error
+ */
+ protected <T> T unmarshal(String name, Class<T> expected) throws Exception
+ {
+ return unmarshal(name, expected, null);
+ }
+
+ /**
* Unmarshal some xml
*
* @param name the name
@@ -212,7 +224,7 @@
return url.toString();
}
- protected static SchemaBindingResolver schemaResolverForClass(final Class root)
+ protected static SchemaBindingResolver schemaResolverForClass(final Class<?> root)
{
return new SchemaBindingResolver()
{
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testEverything.xml 2007-10-23 13:19:38 UTC (rev 66359)
@@ -201,13 +201,6 @@
<!-- TODO service-ref -->
- <security-identity id="session1SecurityIdentity-id">
- <description>en-session1SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
- <description xml:lang="de">de-session1SecurityIdentity-desc</description>
- <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="session1ResourceRef1-id">
<description>en-session1ResourceRef1-desc</description>
<description xml:lang="fr">fr-session1ResourceRef1-desc</description>
@@ -317,6 +310,13 @@
<jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity id="session1SecurityIdentity-id">
+ <description>en-session1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-session1SecurityIdentity-desc</description>
+ <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config id="session1ClusterConfig-id">
@@ -637,13 +637,6 @@
<!-- TODO service-ref -->
- <security-identity id="session2SecurityIdentity-id">
- <description>en-session2SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
- <description xml:lang="de">de-session2SecurityIdentity-desc</description>
- <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="session2ResourceRef1-id">
<description>en-session2ResourceRef1-desc</description>
<description xml:lang="fr">fr-session2ResourceRef1-desc</description>
@@ -753,6 +746,13 @@
<jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity id="session2SecurityIdentity-id">
+ <description>en-session2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-session2SecurityIdentity-desc</description>
+ <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>false</clustered>
<cluster-config id="session2ClusterConfig-id">
@@ -1067,13 +1067,6 @@
<!-- TODO service-ref -->
- <security-identity id="entity1SecurityIdentity-id">
- <description>en-entity1SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
- <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
- <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="entity1ResourceRef1-id">
<description>en-entity1ResourceRef1-desc</description>
<description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
@@ -1195,6 +1188,13 @@
</method>
</method-attributes>
+ <security-identity id="entity1SecurityIdentity-id">
+ <description>en-entity1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
+ <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config id="entity1ClusterConfig-id">
@@ -1484,13 +1484,6 @@
<!-- TODO service-ref -->
- <security-identity id="entity2SecurityIdentity-id">
- <description>en-entity2SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
- <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
- <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="entity2ResourceRef1-id">
<description>en-entity2ResourceRef1-desc</description>
<description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
@@ -1612,6 +1605,13 @@
</method>
</method-attributes>
+ <security-identity id="entity2SecurityIdentity-id">
+ <description>en-entity2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
+ <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>false</clustered>
<cluster-config id="entity2ClusterConfig-id">
@@ -1908,13 +1908,6 @@
<!-- TODO service-ref -->
- <security-identity id="mdb1SecurityIdentity-id">
- <description>en-mdb1SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
- <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="mdb1ResourceRef1-id">
<description>en-mdb1ResourceRef1-desc</description>
<description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
@@ -2036,6 +2029,13 @@
</method>
</method-attributes>
+ <security-identity id="mdb1SecurityIdentity-id">
+ <description>en-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
@@ -2322,13 +2322,6 @@
<!-- TODO service-ref -->
- <security-identity id="mdb2SecurityIdentity-id">
- <description>en-mdb2SecurityIdentity-desc</description>
- <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
- <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="mdb2ResourceRef1-id">
<description>en-mdb2ResourceRef1-desc</description>
<description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
@@ -2450,6 +2443,13 @@
</method>
</method-attributes>
+ <security-identity id="mdb2SecurityIdentity-id">
+ <description>en-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2007-10-23 09:49:24 UTC (rev 66358)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testOverride.xml 2007-10-23 13:19:38 UTC (rev 66359)
@@ -45,31 +45,31 @@
</session>
<session id="session1-id">
- <jee:description>en-session1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1-desc</jee:description>
- <jee:description xml:lang="de">de-session1-desc</jee:description>
- <jee:display-name>en-session1-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-session1-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-session1-disp</jee:display-name>
- <jee:icon id="en-session1-icon-id">
- <jee:small-icon>en-session1-small-icon</jee:small-icon>
- <jee:large-icon>en-session1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-session1-icon-id">
- <jee:small-icon>fr-session1-small-icon</jee:small-icon>
- <jee:large-icon>fr-session1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-session1-icon-id">
- <jee:small-icon>de-session1-small-icon</jee:small-icon>
- <jee:large-icon>de-session1-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-session1-desc</description>
+ <description xml:lang="fr">fr-session1-desc</description>
+ <description xml:lang="de">de-session1-desc</description>
+ <display-name>en-session1-disp</display-name>
+ <display-name xml:lang="fr">fr-session1-disp</display-name>
+ <display-name xml:lang="de">de-session1-disp</display-name>
+ <icon id="en-session1-icon-id">
+ <small-icon>en-session1-small-icon</small-icon>
+ <large-icon>en-session1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-session1-icon-id">
+ <small-icon>fr-session1-small-icon</small-icon>
+ <large-icon>fr-session1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-session1-icon-id">
+ <small-icon>de-session1-small-icon</small-icon>
+ <large-icon>de-session1-large-icon</large-icon>
+ </icon>
<ejb-name>session1EjbName</ejb-name>
<remote-binding id="session1RemoteBinding-id">
- <jee:description>en-session1RemoteBinding-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1RemoteBinding-desc</jee:description>
- <jee:description xml:lang="de">de-session1RemoteBinding-desc</jee:description>
+ <description>en-session1RemoteBinding-desc</description>
+ <description xml:lang="fr">fr-session1RemoteBinding-desc</description>
+ <description xml:lang="de">de-session1RemoteBinding-desc</description>
<jndi-name>session1RemoteBindingJndiName</jndi-name>
<client-bind-url>session1RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session1RemoteBindingInterceptorStack</interceptor-stack>
@@ -84,23 +84,23 @@
<configuration-name>session1ConfigurationName</configuration-name>
<invoker-bindings id="session1InvokerBindings-id">
- <jee:description>en-session1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-session1InvokerBindings-desc</jee:description>
+ <description>en-session1InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-session1InvokerBindings-desc</description>
+ <description xml:lang="de">de-session1InvokerBindings-desc</description>
<invoker id="session1Invoker1-id">
- <jee:description>en-session1Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-session1Invoker1-desc</jee:description>
+ <description>en-session1Invoker1-desc</description>
+ <description xml:lang="fr">fr-session1Invoker1-desc</description>
+ <description xml:lang="de">de-session1Invoker1-desc</description>
<invoker-proxy-binding-name>session1Invoker1Name</invoker-proxy-binding-name>
<jndi-name>session1Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="session1Invoker2-id">
- <jee:description>en-session1Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-session1Invoker2-desc</jee:description>
+ <description>en-session1Invoker2-desc</description>
+ <description xml:lang="fr">fr-session1Invoker2-desc</description>
+ <description xml:lang="de">de-session1Invoker2-desc</description>
<invoker-proxy-binding-name>session1Invoker2Name</invoker-proxy-binding-name>
<jndi-name>session1Invoker2JndiName</jndi-name>
@@ -111,9 +111,9 @@
<security-proxy>session1SecurityProxy</security-proxy>
<ejb-ref id="session1EjbRef1-id">
- <jee:description>en-session1EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1EjbRef1-desc</jee:description>
+ <description>en-session1EjbRef1-desc</description>
+ <description xml:lang="fr">fr-session1EjbRef1-desc</description>
+ <description xml:lang="de">de-session1EjbRef1-desc</description>
<ejb-ref-name>session1EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -128,9 +128,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="session1EjbRef2-id">
- <jee:description>en-session1EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1EjbRef2-desc</jee:description>
+ <description>en-session1EjbRef2-desc</description>
+ <description xml:lang="fr">fr-session1EjbRef2-desc</description>
+ <description xml:lang="de">de-session1EjbRef2-desc</description>
<ejb-ref-name>session1EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -145,9 +145,9 @@
</ejb-ref>
<ejb-local-ref id="session1EjbLocalRef1-id">
- <jee:description>en-session1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1EjbLocalRef1-desc</jee:description>
+ <description>en-session1EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-session1EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-session1EjbLocalRef1-desc</description>
<ejb-ref-name>session1EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -162,9 +162,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="session1EjbLocalRef2-id">
- <jee:description>en-session1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1EjbLocalRef2-desc</jee:description>
+ <description>en-session1EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-session1EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-session1EjbLocalRef2-desc</description>
<ejb-ref-name>session1EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -180,17 +180,10 @@
<!-- TODO service-ref -->
- <security-identity id="session1SecurityIdentity-id">
- <jee:description>en-session1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-session1SecurityIdentity-desc</jee:description>
- <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="session1ResourceRef1-id">
- <jee:description>en-session1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1ResourceRef1-desc</jee:description>
+ <description>en-session1ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-session1ResourceRef1-desc</description>
+ <description xml:lang="de">de-session1ResourceRef1-desc</description>
<res-ref-name>session1ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>session1ResourceRef1Injection1Class</injection-target-class>
@@ -204,9 +197,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="session1ResourceRef2-id">
- <jee:description>en-session1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1ResourceRef2-desc</jee:description>
+ <description>en-session1ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-session1ResourceRef2-desc</description>
+ <description xml:lang="de">de-session1ResourceRef2-desc</description>
<res-ref-name>session1ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>session1ResourceRef2Injection1Class</injection-target-class>
@@ -219,9 +212,9 @@
<jndi-name>session1ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="session1ResourceEnvRef1-id">
- <jee:description>en-session1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1ResourceEnvRef1-desc</jee:description>
+ <description>en-session1ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-session1ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-session1ResourceEnvRef1-desc</description>
<resource-env-ref-name>session1ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>session1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -235,9 +228,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="session1ResourceEnvRef2-id">
- <jee:description>en-session1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1ResourceEnvRef2-desc</jee:description>
+ <description>en-session1ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-session1ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-session1ResourceEnvRef2-desc</description>
<resource-env-ref-name>session1ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>session1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -250,9 +243,9 @@
<jndi-name>session1ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="session1MessageDestinationRef1-id">
- <jee:description>en-session1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1MessageDestinationRef1-desc</jee:description>
+ <description>en-session1MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-session1MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-session1MessageDestinationRef1-desc</description>
<message-destination-ref-name>session1MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -266,9 +259,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="session1MessageDestinationRef2-id">
- <jee:description>en-session1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1MessageDestinationRef2-desc</jee:description>
+ <description>en-session1MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-session1MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-session1MessageDestinationRef2-desc</description>
<message-destination-ref-name>session1MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -281,9 +274,9 @@
<jndi-name>session1MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="session1MessageDestinationRef3-id">
- <jee:description>en-session1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-session1MessageDestinationRef3-desc</jee:description>
+ <description>en-session1MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-session1MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-session1MessageDestinationRef3-desc</description>
<message-destination-ref-name>session1MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -296,12 +289,19 @@
<jndi-name>session1MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity id="session1SecurityIdentity-id">
+ <description>en-session1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-session1SecurityIdentity-desc</description>
+ <run-as-principal>session1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config id="session1ClusterConfig-id">
- <jee:description>en-session1ClusterConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ClusterConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session1ClusterConfig-desc</jee:description>
+ <description>en-session1ClusterConfig-desc</description>
+ <description xml:lang="fr">fr-session1ClusterConfig-desc</description>
+ <description xml:lang="de">de-session1ClusterConfig-desc</description>
<partition-name>session1ClusterConfigPartitionName</partition-name>
<home-load-balancing-policy>session1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
<bean-load-balancing-policy>session1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -326,13 +326,13 @@
<depends>session1Depends2</depends>
<ior-security-config id="session1IorSecurityConfig-id">
- <jee:description>en-session1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session1IorSecurityConfig-desc</jee:description>
+ <description>en-session1IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-session1IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-session1IorSecurityConfig-desc</description>
<transport-config id="session1TransportConfig-id">
- <jee:description>en-session1TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session1TransportConfig-desc</jee:description>
+ <description>en-session1TransportConfig-desc</description>
+ <description xml:lang="fr">fr-session1TransportConfig-desc</description>
+ <description xml:lang="de">de-session1TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -341,17 +341,17 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="session1ASContext-id">
- <jee:description>en-session1ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-session1ASContext-desc</jee:description>
+ <description>en-session1ASContext-desc</description>
+ <description xml:lang="fr">fr-session1ASContext-desc</description>
+ <description xml:lang="de">de-session1ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>session1ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="session1SASContext-id">
- <jee:description>en-session1SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-session1SASContext-desc</jee:description>
+ <description>en-session1SASContext-desc</description>
+ <description xml:lang="fr">fr-session1SASContext-desc</description>
+ <description xml:lang="de">de-session1SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
@@ -365,16 +365,16 @@
</port-component>
<ejb-timeout-identity id="session1EjbTimeoutIdentity-id">
- <jee:description>en-session1EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-session1EjbTimeoutIdentity-desc</jee:description>
+ <description>en-session1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-session1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-session1EjbTimeoutIdentity-desc</description>
<run-as-principal>session1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
</ejb-timeout-identity>
<annotation id="session1Annotation1-id">
- <jee:description>en-session1Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation1-desc</jee:description>
+ <description>en-session1Annotation1-desc</description>
+ <description xml:lang="fr">fr-session1Annotation1-desc</description>
+ <description xml:lang="de">de-session1Annotation1-desc</description>
<annotation-class>session1Annotation1Class</annotation-class>
<annotation-implementation-class>session1Annotation1Impl</annotation-implementation-class>
@@ -383,24 +383,24 @@
<injection-target-name>session1Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="session1Annotation1Property1-id">
- <jee:description>en-session1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation1Property1-desc</jee:description>
+ <description>en-session1Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-session1Annotation1Property1-desc</description>
+ <description xml:lang="de">de-session1Annotation1Property1-desc</description>
<property-name>session1Annotation1Property1Name</property-name>
<property-value>session1Annotation1Property1Value</property-value>
</property>
<property id="session1Annotation1Property2-id">
- <jee:description>en-session1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation1Property2-desc</jee:description>
+ <description>en-session1Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-session1Annotation1Property2-desc</description>
+ <description xml:lang="de">de-session1Annotation1Property2-desc</description>
<property-name>session1Annotation1Property2Name</property-name>
<property-value>session1Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="session1Annotation2-id">
- <jee:description>en-session1Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation2-desc</jee:description>
+ <description>en-session1Annotation2-desc</description>
+ <description xml:lang="fr">fr-session1Annotation2-desc</description>
+ <description xml:lang="de">de-session1Annotation2-desc</description>
<annotation-class>session1Annotation2Class</annotation-class>
<annotation-implementation-class>session1Annotation2Impl</annotation-implementation-class>
@@ -409,25 +409,25 @@
<injection-target-name>session1Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="session1Annotation2Property1-id">
- <jee:description>en-session1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation2Property1-desc</jee:description>
+ <description>en-session1Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-session1Annotation2Property1-desc</description>
+ <description xml:lang="de">de-session1Annotation2Property1-desc</description>
<property-name>session1Annotation2Property1Name</property-name>
<property-value>session1Annotation2Property1Value</property-value>
</property>
<property id="session1Annotation2Property2-id">
- <jee:description>en-session1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-session1Annotation2Property2-desc</jee:description>
+ <description>en-session1Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-session1Annotation2Property2-desc</description>
+ <description xml:lang="de">de-session1Annotation2Property2-desc</description>
<property-name>session1Annotation2Property2Name</property-name>
<property-value>session1Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="session1IgnoreDependency-id">
- <jee:description>en-session1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-session1IgnoreDependency-desc</jee:description>
+ <description>en-session1IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-session1IgnoreDependency-desc</description>
+ <description xml:lang="de">de-session1IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>session1IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>session1IgnoreDependencyInjection1Name</injection-target-name>
@@ -448,9 +448,9 @@
<!-- TODO jndi ref -->
<jndi-ref id="session1JndiRef1-id">
- <jee:description>en-session1JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session1JndiRef1-desc</jee:description>
+ <description>en-session1JndiRef1-desc</description>
+ <description xml:lang="fr">fr-session1JndiRef1-desc</description>
+ <description xml:lang="de">de-session1JndiRef1-desc</description>
<jndi-ref-name>session1JndiRef1Name</jndi-ref-name>
<mapped-name>session1JndiRef1MappedName</mapped-name>
<injection-target>
@@ -463,9 +463,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="session1JndiRef2-id">
- <jee:description>en-session1JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session1JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session1JndiRef2-desc</jee:description>
+ <description>en-session1JndiRef2-desc</description>
+ <description xml:lang="fr">fr-session1JndiRef2-desc</description>
+ <description xml:lang="de">de-session1JndiRef2-desc</description>
<jndi-ref-name>session1JndiRef2Name</jndi-ref-name>
<mapped-name>session1JndiRef2MappedName</mapped-name>
<injection-target>
@@ -481,31 +481,31 @@
</session>
<session id="session2-id">
- <jee:description>en-session2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2-desc</jee:description>
- <jee:description xml:lang="de">de-session2-desc</jee:description>
- <jee:display-name>en-session2-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-session2-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-session2-disp</jee:display-name>
- <jee:icon id="en-session2-icon-id">
- <jee:small-icon>en-session2-small-icon</jee:small-icon>
- <jee:large-icon>en-session2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-session2-icon-id">
- <jee:small-icon>fr-session2-small-icon</jee:small-icon>
- <jee:large-icon>fr-session2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-session2-icon-id">
- <jee:small-icon>de-session2-small-icon</jee:small-icon>
- <jee:large-icon>de-session2-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-session2-desc</description>
+ <description xml:lang="fr">fr-session2-desc</description>
+ <description xml:lang="de">de-session2-desc</description>
+ <display-name>en-session2-disp</display-name>
+ <display-name xml:lang="fr">fr-session2-disp</display-name>
+ <display-name xml:lang="de">de-session2-disp</display-name>
+ <icon id="en-session2-icon-id">
+ <small-icon>en-session2-small-icon</small-icon>
+ <large-icon>en-session2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-session2-icon-id">
+ <small-icon>fr-session2-small-icon</small-icon>
+ <large-icon>fr-session2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-session2-icon-id">
+ <small-icon>de-session2-small-icon</small-icon>
+ <large-icon>de-session2-large-icon</large-icon>
+ </icon>
<ejb-name>session2EjbName</ejb-name>
<remote-binding id="session2RemoteBinding-id">
- <jee:description>en-session2RemoteBinding-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2RemoteBinding-desc</jee:description>
- <jee:description xml:lang="de">de-session2RemoteBinding-desc</jee:description>
+ <description>en-session2RemoteBinding-desc</description>
+ <description xml:lang="fr">fr-session2RemoteBinding-desc</description>
+ <description xml:lang="de">de-session2RemoteBinding-desc</description>
<jndi-name>session2RemoteBindingJndiName</jndi-name>
<client-bind-url>session2RemoteBindingClientBindUrl</client-bind-url>
<interceptor-stack>session2RemoteBindingInterceptorStack</interceptor-stack>
@@ -520,23 +520,23 @@
<configuration-name>session2ConfigurationName</configuration-name>
<invoker-bindings id="session2InvokerBindings-id">
- <jee:description>en-session2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-session2InvokerBindings-desc</jee:description>
+ <description>en-session2InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-session2InvokerBindings-desc</description>
+ <description xml:lang="de">de-session2InvokerBindings-desc</description>
<invoker id="session2Invoker1-id">
- <jee:description>en-session2Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-session2Invoker1-desc</jee:description>
+ <description>en-session2Invoker1-desc</description>
+ <description xml:lang="fr">fr-session2Invoker1-desc</description>
+ <description xml:lang="de">de-session2Invoker1-desc</description>
<invoker-proxy-binding-name>session2Invoker1Name</invoker-proxy-binding-name>
<jndi-name>session2Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="session2Invoker2-id">
- <jee:description>en-session2Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-session2Invoker2-desc</jee:description>
+ <description>en-session2Invoker2-desc</description>
+ <description xml:lang="fr">fr-session2Invoker2-desc</description>
+ <description xml:lang="de">de-session2Invoker2-desc</description>
<invoker-proxy-binding-name>session2Invoker2Name</invoker-proxy-binding-name>
<jndi-name>session2Invoker2JndiName</jndi-name>
@@ -547,9 +547,9 @@
<security-proxy>session2SecurityProxy</security-proxy>
<ejb-ref id="session2EjbRef1-id">
- <jee:description>en-session2EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2EjbRef1-desc</jee:description>
+ <description>en-session2EjbRef1-desc</description>
+ <description xml:lang="fr">fr-session2EjbRef1-desc</description>
+ <description xml:lang="de">de-session2EjbRef1-desc</description>
<ejb-ref-name>session2EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -564,9 +564,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="session2EjbRef2-id">
- <jee:description>en-session2EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2EjbRef2-desc</jee:description>
+ <description>en-session2EjbRef2-desc</description>
+ <description xml:lang="fr">fr-session2EjbRef2-desc</description>
+ <description xml:lang="de">de-session2EjbRef2-desc</description>
<ejb-ref-name>session2EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -581,9 +581,9 @@
</ejb-ref>
<ejb-local-ref id="session2EjbLocalRef1-id">
- <jee:description>en-session2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2EjbLocalRef1-desc</jee:description>
+ <description>en-session2EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-session2EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-session2EjbLocalRef1-desc</description>
<ejb-ref-name>session2EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -598,9 +598,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="session2EjbLocalRef2-id">
- <jee:description>en-session2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2EjbLocalRef2-desc</jee:description>
+ <description>en-session2EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-session2EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-session2EjbLocalRef2-desc</description>
<ejb-ref-name>session2EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -616,17 +616,10 @@
<!-- TODO service-ref -->
- <security-identity id="session2SecurityIdentity-id">
- <jee:description>en-session2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-session2SecurityIdentity-desc</jee:description>
- <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="session2ResourceRef1-id">
- <jee:description>en-session2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2ResourceRef1-desc</jee:description>
+ <description>en-session2ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-session2ResourceRef1-desc</description>
+ <description xml:lang="de">de-session2ResourceRef1-desc</description>
<res-ref-name>session2ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>session2ResourceRef1Injection1Class</injection-target-class>
@@ -640,9 +633,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="session2ResourceRef2-id">
- <jee:description>en-session2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2ResourceRef2-desc</jee:description>
+ <description>en-session2ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-session2ResourceRef2-desc</description>
+ <description xml:lang="de">de-session2ResourceRef2-desc</description>
<res-ref-name>session2ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>session2ResourceRef2Injection1Class</injection-target-class>
@@ -655,9 +648,9 @@
<jndi-name>session2ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="session2ResourceEnvRef1-id">
- <jee:description>en-session2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2ResourceEnvRef1-desc</jee:description>
+ <description>en-session2ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-session2ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-session2ResourceEnvRef1-desc</description>
<resource-env-ref-name>session2ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>session2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -671,9 +664,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="session2ResourceEnvRef2-id">
- <jee:description>en-session2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2ResourceEnvRef2-desc</jee:description>
+ <description>en-session2ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-session2ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-session2ResourceEnvRef2-desc</description>
<resource-env-ref-name>session2ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>session2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -686,9 +679,9 @@
<jndi-name>session2ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="session2MessageDestinationRef1-id">
- <jee:description>en-session2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2MessageDestinationRef1-desc</jee:description>
+ <description>en-session2MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-session2MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-session2MessageDestinationRef1-desc</description>
<message-destination-ref-name>session2MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -702,9 +695,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="session2MessageDestinationRef2-id">
- <jee:description>en-session2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2MessageDestinationRef2-desc</jee:description>
+ <description>en-session2MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-session2MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-session2MessageDestinationRef2-desc</description>
<message-destination-ref-name>session2MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -717,9 +710,9 @@
<jndi-name>session2MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="session2MessageDestinationRef3-id">
- <jee:description>en-session2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-session2MessageDestinationRef3-desc</jee:description>
+ <description>en-session2MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-session2MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-session2MessageDestinationRef3-desc</description>
<message-destination-ref-name>session2MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>session2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -732,12 +725,19 @@
<jndi-name>session2MessageDestinationRef3JndiName</jndi-name>
</message-destination-ref>
+ <security-identity id="session2SecurityIdentity-id">
+ <description>en-session2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-session2SecurityIdentity-desc</description>
+ <run-as-principal>session2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>false</clustered>
<cluster-config id="session2ClusterConfig-id">
- <jee:description>en-session2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session2ClusterConfig-desc</jee:description>
+ <description>en-session2ClusterConfig-desc</description>
+ <description xml:lang="fr">fr-session2ClusterConfig-desc</description>
+ <description xml:lang="de">de-session2ClusterConfig-desc</description>
<partition-name>session2ClusterConfigPartitionName</partition-name>
<home-load-balancing-policy>session2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
<bean-load-balancing-policy>session2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -762,13 +762,13 @@
<depends>session2Depends2</depends>
<ior-security-config id="session2IorSecurityConfig-id">
- <jee:description>en-session2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session2IorSecurityConfig-desc</jee:description>
+ <description>en-session2IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-session2IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-session2IorSecurityConfig-desc</description>
<transport-config id="session2TransportConfig-id">
- <jee:description>en-session2TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-session2TransportConfig-desc</jee:description>
+ <description>en-session2TransportConfig-desc</description>
+ <description xml:lang="fr">fr-session2TransportConfig-desc</description>
+ <description xml:lang="de">de-session2TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -777,17 +777,17 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="session2ASContext-id">
- <jee:description>en-session2ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-session2ASContext-desc</jee:description>
+ <description>en-session2ASContext-desc</description>
+ <description xml:lang="fr">fr-session2ASContext-desc</description>
+ <description xml:lang="de">de-session2ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>session2ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="session2SASContext-id">
- <jee:description>en-session2SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-session2SASContext-desc</jee:description>
+ <description>en-session2SASContext-desc</description>
+ <description xml:lang="fr">fr-session2SASContext-desc</description>
+ <description xml:lang="de">de-session2SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
@@ -801,16 +801,16 @@
</port-component>
<ejb-timeout-identity id="session2EjbTimeoutIdentity-id">
- <jee:description>en-session2EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-session2EjbTimeoutIdentity-desc</jee:description>
+ <description>en-session2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-session2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-session2EjbTimeoutIdentity-desc</description>
<run-as-principal>session2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
</ejb-timeout-identity>
<annotation id="session2Annotation1-id">
- <jee:description>en-session2Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation1-desc</jee:description>
+ <description>en-session2Annotation1-desc</description>
+ <description xml:lang="fr">fr-session2Annotation1-desc</description>
+ <description xml:lang="de">de-session2Annotation1-desc</description>
<annotation-class>session2Annotation1Class</annotation-class>
<annotation-implementation-class>session2Annotation1Impl</annotation-implementation-class>
@@ -819,24 +819,24 @@
<injection-target-name>session2Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="session2Annotation1Property1-id">
- <jee:description>en-session2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation1Property1-desc</jee:description>
+ <description>en-session2Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-session2Annotation1Property1-desc</description>
+ <description xml:lang="de">de-session2Annotation1Property1-desc</description>
<property-name>session2Annotation1Property1Name</property-name>
<property-value>session2Annotation1Property1Value</property-value>
</property>
<property id="session2Annotation1Property2-id">
- <jee:description>en-session2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation1Property2-desc</jee:description>
+ <description>en-session2Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-session2Annotation1Property2-desc</description>
+ <description xml:lang="de">de-session2Annotation1Property2-desc</description>
<property-name>session2Annotation1Property2Name</property-name>
<property-value>session2Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="session2Annotation2-id">
- <jee:description>en-session2Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation2-desc</jee:description>
+ <description>en-session2Annotation2-desc</description>
+ <description xml:lang="fr">fr-session2Annotation2-desc</description>
+ <description xml:lang="de">de-session2Annotation2-desc</description>
<annotation-class>session2Annotation2Class</annotation-class>
<annotation-implementation-class>session2Annotation2Impl</annotation-implementation-class>
@@ -845,25 +845,25 @@
<injection-target-name>session2Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="session2Annotation2Property1-id">
- <jee:description>en-session2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation2Property1-desc</jee:description>
+ <description>en-session2Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-session2Annotation2Property1-desc</description>
+ <description xml:lang="de">de-session2Annotation2Property1-desc</description>
<property-name>session2Annotation2Property1Name</property-name>
<property-value>session2Annotation2Property1Value</property-value>
</property>
<property id="session2Annotation2Property2-id">
- <jee:description>en-session2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-session2Annotation2Property2-desc</jee:description>
+ <description>en-session2Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-session2Annotation2Property2-desc</description>
+ <description xml:lang="de">de-session2Annotation2Property2-desc</description>
<property-name>session2Annotation2Property2Name</property-name>
<property-value>session2Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="session2IgnoreDependency-id">
- <jee:description>en-session2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-session2IgnoreDependency-desc</jee:description>
+ <description>en-session2IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-session2IgnoreDependency-desc</description>
+ <description xml:lang="de">de-session2IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>session2IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>session2IgnoreDependencyInjection1Name</injection-target-name>
@@ -883,9 +883,9 @@
<concurrent>false</concurrent>
<jndi-ref id="session2JndiRef1-id">
- <jee:description>en-session2JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-session2JndiRef1-desc</jee:description>
+ <description>en-session2JndiRef1-desc</description>
+ <description xml:lang="fr">fr-session2JndiRef1-desc</description>
+ <description xml:lang="de">de-session2JndiRef1-desc</description>
<jndi-ref-name>session2JndiRef1Name</jndi-ref-name>
<mapped-name>session2JndiRef1MappedName</mapped-name>
<injection-target>
@@ -898,9 +898,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="session2JndiRef2-id">
- <jee:description>en-session2JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-session2JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-session2JndiRef2-desc</jee:description>
+ <description>en-session2JndiRef2-desc</description>
+ <description xml:lang="fr">fr-session2JndiRef2-desc</description>
+ <description xml:lang="de">de-session2JndiRef2-desc</description>
<jndi-ref-name>session2JndiRef2Name</jndi-ref-name>
<mapped-name>session2JndiRef2MappedName</mapped-name>
<injection-target>
@@ -920,24 +920,24 @@
</entity>
<entity id="entity1-id">
- <jee:description>en-entity1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1-desc</jee:description>
- <jee:display-name>en-entity1-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-entity1-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-entity1-disp</jee:display-name>
- <jee:icon id="en-entity1-icon-id">
- <jee:small-icon>en-entity1-small-icon</jee:small-icon>
- <jee:large-icon>en-entity1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-entity1-icon-id">
- <jee:small-icon>fr-entity1-small-icon</jee:small-icon>
- <jee:large-icon>fr-entity1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-entity1-icon-id">
- <jee:small-icon>de-entity1-small-icon</jee:small-icon>
- <jee:large-icon>de-entity1-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-entity1-desc</description>
+ <description xml:lang="fr">fr-entity1-desc</description>
+ <description xml:lang="de">de-entity1-desc</description>
+ <display-name>en-entity1-disp</display-name>
+ <display-name xml:lang="fr">fr-entity1-disp</display-name>
+ <display-name xml:lang="de">de-entity1-disp</display-name>
+ <icon id="en-entity1-icon-id">
+ <small-icon>en-entity1-small-icon</small-icon>
+ <large-icon>en-entity1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-entity1-icon-id">
+ <small-icon>fr-entity1-small-icon</small-icon>
+ <large-icon>fr-entity1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-entity1-icon-id">
+ <small-icon>de-entity1-small-icon</small-icon>
+ <large-icon>de-entity1-large-icon</large-icon>
+ </icon>
<ejb-name>entity1EjbName</ejb-name>
@@ -950,23 +950,23 @@
<configuration-name>entity1ConfigurationName</configuration-name>
<invoker-bindings id="entity1InvokerBindings-id">
- <jee:description>en-entity1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-entity1InvokerBindings-desc</jee:description>
+ <description>en-entity1InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-entity1InvokerBindings-desc</description>
+ <description xml:lang="de">de-entity1InvokerBindings-desc</description>
<invoker id="entity1Invoker1-id">
- <jee:description>en-entity1Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Invoker1-desc</jee:description>
+ <description>en-entity1Invoker1-desc</description>
+ <description xml:lang="fr">fr-entity1Invoker1-desc</description>
+ <description xml:lang="de">de-entity1Invoker1-desc</description>
<invoker-proxy-binding-name>entity1Invoker1Name</invoker-proxy-binding-name>
<jndi-name>entity1Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="entity1Invoker2-id">
- <jee:description>en-entity1Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Invoker2-desc</jee:description>
+ <description>en-entity1Invoker2-desc</description>
+ <description xml:lang="fr">fr-entity1Invoker2-desc</description>
+ <description xml:lang="de">de-entity1Invoker2-desc</description>
<invoker-proxy-binding-name>entity1Invoker2Name</invoker-proxy-binding-name>
<jndi-name>entity1Invoker2JndiName</jndi-name>
@@ -977,9 +977,9 @@
<security-proxy>entity1SecurityProxy</security-proxy>
<ejb-ref id="entity1EjbRef1-id">
- <jee:description>en-entity1EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1EjbRef1-desc</jee:description>
+ <description>en-entity1EjbRef1-desc</description>
+ <description xml:lang="fr">fr-entity1EjbRef1-desc</description>
+ <description xml:lang="de">de-entity1EjbRef1-desc</description>
<ejb-ref-name>entity1EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -994,9 +994,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="entity1EjbRef2-id">
- <jee:description>en-entity1EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1EjbRef2-desc</jee:description>
+ <description>en-entity1EjbRef2-desc</description>
+ <description xml:lang="fr">fr-entity1EjbRef2-desc</description>
+ <description xml:lang="de">de-entity1EjbRef2-desc</description>
<ejb-ref-name>entity1EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -1011,9 +1011,9 @@
</ejb-ref>
<ejb-local-ref id="entity1EjbLocalRef1-id">
- <jee:description>en-entity1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1EjbLocalRef1-desc</jee:description>
+ <description>en-entity1EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-entity1EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-entity1EjbLocalRef1-desc</description>
<ejb-ref-name>entity1EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -1028,9 +1028,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="entity1EjbLocalRef2-id">
- <jee:description>en-entity1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1EjbLocalRef2-desc</jee:description>
+ <description>en-entity1EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-entity1EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-entity1EjbLocalRef2-desc</description>
<ejb-ref-name>entity1EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -1046,17 +1046,10 @@
<!-- TODO service-ref -->
- <security-identity id="entity1SecurityIdentity-id">
- <jee:description>en-entity1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-entity1SecurityIdentity-desc</jee:description>
- <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="entity1ResourceRef1-id">
- <jee:description>en-entity1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ResourceRef1-desc</jee:description>
+ <description>en-entity1ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-entity1ResourceRef1-desc</description>
+ <description xml:lang="de">de-entity1ResourceRef1-desc</description>
<res-ref-name>entity1ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>entity1ResourceRef1Injection1Class</injection-target-class>
@@ -1070,9 +1063,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="entity1ResourceRef2-id">
- <jee:description>en-entity1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ResourceRef2-desc</jee:description>
+ <description>en-entity1ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-entity1ResourceRef2-desc</description>
+ <description xml:lang="de">de-entity1ResourceRef2-desc</description>
<res-ref-name>entity1ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>entity1ResourceRef2Injection1Class</injection-target-class>
@@ -1085,9 +1078,9 @@
<jndi-name>entity1ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="entity1ResourceEnvRef1-id">
- <jee:description>en-entity1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ResourceEnvRef1-desc</jee:description>
+ <description>en-entity1ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-entity1ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-entity1ResourceEnvRef1-desc</description>
<resource-env-ref-name>entity1ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>entity1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1101,9 +1094,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="entity1ResourceEnvRef2-id">
- <jee:description>en-entity1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ResourceEnvRef2-desc</jee:description>
+ <description>en-entity1ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-entity1ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-entity1ResourceEnvRef2-desc</description>
<resource-env-ref-name>entity1ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>entity1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1116,9 +1109,9 @@
<jndi-name>entity1ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="entity1MessageDestinationRef1-id">
- <jee:description>en-entity1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1MessageDestinationRef1-desc</jee:description>
+ <description>en-entity1MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-entity1MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-entity1MessageDestinationRef1-desc</description>
<message-destination-ref-name>entity1MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1132,9 +1125,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="entity1MessageDestinationRef2-id">
- <jee:description>en-entity1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1MessageDestinationRef2-desc</jee:description>
+ <description>en-entity1MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-entity1MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-entity1MessageDestinationRef2-desc</description>
<message-destination-ref-name>entity1MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1147,9 +1140,9 @@
<jndi-name>entity1MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="entity1MessageDestinationRef3-id">
- <jee:description>en-entity1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-entity1MessageDestinationRef3-desc</jee:description>
+ <description>en-entity1MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-entity1MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-entity1MessageDestinationRef3-desc</description>
<message-destination-ref-name>entity1MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1174,12 +1167,19 @@
</method>
</method-attributes>
+ <security-identity id="entity1SecurityIdentity-id">
+ <description>en-entity1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-entity1SecurityIdentity-desc</description>
+ <run-as-principal>entity1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>true</clustered>
<cluster-config id="entity1ClusterConfig-id">
- <jee:description>en-entity1ClusterConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ClusterConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ClusterConfig-desc</jee:description>
+ <description>en-entity1ClusterConfig-desc</description>
+ <description xml:lang="fr">fr-entity1ClusterConfig-desc</description>
+ <description xml:lang="de">de-entity1ClusterConfig-desc</description>
<partition-name>entity1ClusterConfigPartitionName</partition-name>
<home-load-balancing-policy>entity1ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
<bean-load-balancing-policy>entity1ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1189,9 +1189,9 @@
<cache-invalidation>true</cache-invalidation>
<cache-invalidation-config id="entity1CacheInvalidationConfig-id">
- <jee:description>en-entity1CacheInvalidationConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity1CacheInvalidationConfig-desc</jee:description>
+ <description>en-entity1CacheInvalidationConfig-desc</description>
+ <description xml:lang="fr">fr-entity1CacheInvalidationConfig-desc</description>
+ <description xml:lang="de">de-entity1CacheInvalidationConfig-desc</description>
<invalidation-group-name>entity1CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
<invalidation-manager-name>entity1CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
</cache-invalidation-config>
@@ -1200,13 +1200,13 @@
<depends>entity1Depends2</depends>
<ior-security-config id="entity1IorSecurityConfig-id">
- <jee:description>en-entity1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity1IorSecurityConfig-desc</jee:description>
+ <description>en-entity1IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-entity1IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-entity1IorSecurityConfig-desc</description>
<transport-config id="entity1TransportConfig-id">
- <jee:description>en-entity1TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity1TransportConfig-desc</jee:description>
+ <description>en-entity1TransportConfig-desc</description>
+ <description xml:lang="fr">fr-entity1TransportConfig-desc</description>
+ <description xml:lang="de">de-entity1TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1215,25 +1215,25 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="entity1ASContext-id">
- <jee:description>en-entity1ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-entity1ASContext-desc</jee:description>
+ <description>en-entity1ASContext-desc</description>
+ <description xml:lang="fr">fr-entity1ASContext-desc</description>
+ <description xml:lang="de">de-entity1ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>entity1ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="entity1SASContext-id">
- <jee:description>en-entity1SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-entity1SASContext-desc</jee:description>
+ <description>en-entity1SASContext-desc</description>
+ <description xml:lang="fr">fr-entity1SASContext-desc</description>
+ <description xml:lang="de">de-entity1SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
<annotation id="entity1Annotation1-id">
- <jee:description>en-entity1Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation1-desc</jee:description>
+ <description>en-entity1Annotation1-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation1-desc</description>
+ <description xml:lang="de">de-entity1Annotation1-desc</description>
<annotation-class>entity1Annotation1Class</annotation-class>
<annotation-implementation-class>entity1Annotation1Impl</annotation-implementation-class>
@@ -1242,24 +1242,24 @@
<injection-target-name>entity1Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="entity1Annotation1Property1-id">
- <jee:description>en-entity1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation1Property1-desc</jee:description>
+ <description>en-entity1Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation1Property1-desc</description>
+ <description xml:lang="de">de-entity1Annotation1Property1-desc</description>
<property-name>entity1Annotation1Property1Name</property-name>
<property-value>entity1Annotation1Property1Value</property-value>
</property>
<property id="entity1Annotation1Property2-id">
- <jee:description>en-entity1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation1Property2-desc</jee:description>
+ <description>en-entity1Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation1Property2-desc</description>
+ <description xml:lang="de">de-entity1Annotation1Property2-desc</description>
<property-name>entity1Annotation1Property2Name</property-name>
<property-value>entity1Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="entity1Annotation2-id">
- <jee:description>en-entity1Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation2-desc</jee:description>
+ <description>en-entity1Annotation2-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation2-desc</description>
+ <description xml:lang="de">de-entity1Annotation2-desc</description>
<annotation-class>entity1Annotation2Class</annotation-class>
<annotation-implementation-class>entity1Annotation2Impl</annotation-implementation-class>
@@ -1268,25 +1268,25 @@
<injection-target-name>entity1Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="entity1Annotation2Property1-id">
- <jee:description>en-entity1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation2Property1-desc</jee:description>
+ <description>en-entity1Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation2Property1-desc</description>
+ <description xml:lang="de">de-entity1Annotation2Property1-desc</description>
<property-name>entity1Annotation2Property1Name</property-name>
<property-value>entity1Annotation2Property1Value</property-value>
</property>
<property id="entity1Annotation2Property2-id">
- <jee:description>en-entity1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1Annotation2Property2-desc</jee:description>
+ <description>en-entity1Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-entity1Annotation2Property2-desc</description>
+ <description xml:lang="de">de-entity1Annotation2Property2-desc</description>
<property-name>entity1Annotation2Property2Name</property-name>
<property-value>entity1Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="entity1IgnoreDependency-id">
- <jee:description>en-entity1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-entity1IgnoreDependency-desc</jee:description>
+ <description>en-entity1IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-entity1IgnoreDependency-desc</description>
+ <description xml:lang="de">de-entity1IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>entity1IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>entity1IgnoreDependencyInjection1Name</injection-target-name>
@@ -1304,9 +1304,9 @@
<!-- TODO pool config -->
<jndi-ref id="entity1JndiRef1-id">
- <jee:description>en-entity1JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity1JndiRef1-desc</jee:description>
+ <description>en-entity1JndiRef1-desc</description>
+ <description xml:lang="fr">fr-entity1JndiRef1-desc</description>
+ <description xml:lang="de">de-entity1JndiRef1-desc</description>
<jndi-ref-name>entity1JndiRef1Name</jndi-ref-name>
<mapped-name>entity1JndiRef1MappedName</mapped-name>
<injection-target>
@@ -1319,9 +1319,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="entity1JndiRef2-id">
- <jee:description>en-entity1JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity1JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity1JndiRef2-desc</jee:description>
+ <description>en-entity1JndiRef2-desc</description>
+ <description xml:lang="fr">fr-entity1JndiRef2-desc</description>
+ <description xml:lang="de">de-entity1JndiRef2-desc</description>
<jndi-ref-name>entity1JndiRef2Name</jndi-ref-name>
<mapped-name>entity1JndiRef2MappedName</mapped-name>
<injection-target>
@@ -1337,24 +1337,24 @@
</entity>
<entity id="entity2-id">
- <jee:description>en-entity2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2-desc</jee:description>
- <jee:display-name>en-entity2-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-entity2-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-entity2-disp</jee:display-name>
- <jee:icon id="en-entity2-icon-id">
- <jee:small-icon>en-entity2-small-icon</jee:small-icon>
- <jee:large-icon>en-entity2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-entity2-icon-id">
- <jee:small-icon>fr-entity2-small-icon</jee:small-icon>
- <jee:large-icon>fr-entity2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-entity2-icon-id">
- <jee:small-icon>de-entity2-small-icon</jee:small-icon>
- <jee:large-icon>de-entity2-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-entity2-desc</description>
+ <description xml:lang="fr">fr-entity2-desc</description>
+ <description xml:lang="de">de-entity2-desc</description>
+ <display-name>en-entity2-disp</display-name>
+ <display-name xml:lang="fr">fr-entity2-disp</display-name>
+ <display-name xml:lang="de">de-entity2-disp</display-name>
+ <icon id="en-entity2-icon-id">
+ <small-icon>en-entity2-small-icon</small-icon>
+ <large-icon>en-entity2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-entity2-icon-id">
+ <small-icon>fr-entity2-small-icon</small-icon>
+ <large-icon>fr-entity2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-entity2-icon-id">
+ <small-icon>de-entity2-small-icon</small-icon>
+ <large-icon>de-entity2-large-icon</large-icon>
+ </icon>
<ejb-name>entity2EjbName</ejb-name>
@@ -1367,23 +1367,23 @@
<configuration-name>entity2ConfigurationName</configuration-name>
<invoker-bindings id="entity2InvokerBindings-id">
- <jee:description>en-entity2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-entity2InvokerBindings-desc</jee:description>
+ <description>en-entity2InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-entity2InvokerBindings-desc</description>
+ <description xml:lang="de">de-entity2InvokerBindings-desc</description>
<invoker id="entity2Invoker1-id">
- <jee:description>en-entity2Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Invoker1-desc</jee:description>
+ <description>en-entity2Invoker1-desc</description>
+ <description xml:lang="fr">fr-entity2Invoker1-desc</description>
+ <description xml:lang="de">de-entity2Invoker1-desc</description>
<invoker-proxy-binding-name>entity2Invoker1Name</invoker-proxy-binding-name>
<jndi-name>entity2Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="entity2Invoker2-id">
- <jee:description>en-entity2Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Invoker2-desc</jee:description>
+ <description>en-entity2Invoker2-desc</description>
+ <description xml:lang="fr">fr-entity2Invoker2-desc</description>
+ <description xml:lang="de">de-entity2Invoker2-desc</description>
<invoker-proxy-binding-name>entity2Invoker2Name</invoker-proxy-binding-name>
<jndi-name>entity2Invoker2JndiName</jndi-name>
@@ -1394,9 +1394,9 @@
<security-proxy>entity2SecurityProxy</security-proxy>
<ejb-ref id="entity2EjbRef1-id">
- <jee:description>en-entity2EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2EjbRef1-desc</jee:description>
+ <description>en-entity2EjbRef1-desc</description>
+ <description xml:lang="fr">fr-entity2EjbRef1-desc</description>
+ <description xml:lang="de">de-entity2EjbRef1-desc</description>
<ejb-ref-name>entity2EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -1411,9 +1411,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="entity2EjbRef2-id">
- <jee:description>en-entity2EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2EjbRef2-desc</jee:description>
+ <description>en-entity2EjbRef2-desc</description>
+ <description xml:lang="fr">fr-entity2EjbRef2-desc</description>
+ <description xml:lang="de">de-entity2EjbRef2-desc</description>
<ejb-ref-name>entity2EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -1428,9 +1428,9 @@
</ejb-ref>
<ejb-local-ref id="entity2EjbLocalRef1-id">
- <jee:description>en-entity2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2EjbLocalRef1-desc</jee:description>
+ <description>en-entity2EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-entity2EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-entity2EjbLocalRef1-desc</description>
<ejb-ref-name>entity2EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -1445,9 +1445,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="entity2EjbLocalRef2-id">
- <jee:description>en-entity2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2EjbLocalRef2-desc</jee:description>
+ <description>en-entity2EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-entity2EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-entity2EjbLocalRef2-desc</description>
<ejb-ref-name>entity2EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -1463,17 +1463,10 @@
<!-- TODO service-ref -->
- <security-identity id="entity2SecurityIdentity-id">
- <jee:description>en-entity2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-entity2SecurityIdentity-desc</jee:description>
- <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="entity2ResourceRef1-id">
- <jee:description>en-entity2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ResourceRef1-desc</jee:description>
+ <description>en-entity2ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-entity2ResourceRef1-desc</description>
+ <description xml:lang="de">de-entity2ResourceRef1-desc</description>
<res-ref-name>entity2ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>entity2ResourceRef1Injection1Class</injection-target-class>
@@ -1487,9 +1480,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="entity2ResourceRef2-id">
- <jee:description>en-entity2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ResourceRef2-desc</jee:description>
+ <description>en-entity2ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-entity2ResourceRef2-desc</description>
+ <description xml:lang="de">de-entity2ResourceRef2-desc</description>
<res-ref-name>entity2ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>entity2ResourceRef2Injection1Class</injection-target-class>
@@ -1502,9 +1495,9 @@
<jndi-name>entity2ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="entity2ResourceEnvRef1-id">
- <jee:description>en-entity2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ResourceEnvRef1-desc</jee:description>
+ <description>en-entity2ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-entity2ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-entity2ResourceEnvRef1-desc</description>
<resource-env-ref-name>entity2ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>entity2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1518,9 +1511,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="entity2ResourceEnvRef2-id">
- <jee:description>en-entity2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ResourceEnvRef2-desc</jee:description>
+ <description>en-entity2ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-entity2ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-entity2ResourceEnvRef2-desc</description>
<resource-env-ref-name>entity2ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>entity2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1533,9 +1526,9 @@
<jndi-name>entity2ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="entity2MessageDestinationRef1-id">
- <jee:description>en-entity2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2MessageDestinationRef1-desc</jee:description>
+ <description>en-entity2MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-entity2MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-entity2MessageDestinationRef1-desc</description>
<message-destination-ref-name>entity2MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1549,9 +1542,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="entity2MessageDestinationRef2-id">
- <jee:description>en-entity2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2MessageDestinationRef2-desc</jee:description>
+ <description>en-entity2MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-entity2MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-entity2MessageDestinationRef2-desc</description>
<message-destination-ref-name>entity2MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1564,9 +1557,9 @@
<jndi-name>entity2MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="entity2MessageDestinationRef3-id">
- <jee:description>en-entity2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-entity2MessageDestinationRef3-desc</jee:description>
+ <description>en-entity2MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-entity2MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-entity2MessageDestinationRef3-desc</description>
<message-destination-ref-name>entity2MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>entity2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -1591,12 +1584,19 @@
</method>
</method-attributes>
+ <security-identity id="entity2SecurityIdentity-id">
+ <description>en-entity2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-entity2SecurityIdentity-desc</description>
+ <run-as-principal>entity2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<clustered>false</clustered>
<cluster-config id="entity2ClusterConfig-id">
- <jee:description>en-entity2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ClusterConfig-desc</jee:description>
+ <description>en-entity2ClusterConfig-desc</description>
+ <description xml:lang="fr">fr-entity2ClusterConfig-desc</description>
+ <description xml:lang="de">de-entity2ClusterConfig-desc</description>
<partition-name>entity2ClusterConfigPartitionName</partition-name>
<home-load-balancing-policy>entity2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
<bean-load-balancing-policy>entity2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
@@ -1606,9 +1606,9 @@
<cache-invalidation>false</cache-invalidation>
<cache-invalidation-config id="entity2CacheInvalidationConfig-id">
- <jee:description>en-entity2CacheInvalidationConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity2CacheInvalidationConfig-desc</jee:description>
+ <description>en-entity2CacheInvalidationConfig-desc</description>
+ <description xml:lang="fr">fr-entity2CacheInvalidationConfig-desc</description>
+ <description xml:lang="de">de-entity2CacheInvalidationConfig-desc</description>
<invalidation-group-name>entity2CacheInvalidationConfigInvalidationGroupName</invalidation-group-name>
<invalidation-manager-name>entity2CacheInvalidationConfigInvalidationManagerName</invalidation-manager-name>
</cache-invalidation-config>
@@ -1617,13 +1617,13 @@
<depends>entity2Depends2</depends>
<ior-security-config id="entity2IorSecurityConfig-id">
- <jee:description>en-entity2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity2IorSecurityConfig-desc</jee:description>
+ <description>en-entity2IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-entity2IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-entity2IorSecurityConfig-desc</description>
<transport-config id="entity2TransportConfig-id">
- <jee:description>en-entity2TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-entity2TransportConfig-desc</jee:description>
+ <description>en-entity2TransportConfig-desc</description>
+ <description xml:lang="fr">fr-entity2TransportConfig-desc</description>
+ <description xml:lang="de">de-entity2TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -1632,25 +1632,25 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="entity2ASContext-id">
- <jee:description>en-entity2ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-entity2ASContext-desc</jee:description>
+ <description>en-entity2ASContext-desc</description>
+ <description xml:lang="fr">fr-entity2ASContext-desc</description>
+ <description xml:lang="de">de-entity2ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>entity2ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="entity2SASContext-id">
- <jee:description>en-entity2SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-entity2SASContext-desc</jee:description>
+ <description>en-entity2SASContext-desc</description>
+ <description xml:lang="fr">fr-entity2SASContext-desc</description>
+ <description xml:lang="de">de-entity2SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
<annotation id="entity2Annotation1-id">
- <jee:description>en-entity2Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation1-desc</jee:description>
+ <description>en-entity2Annotation1-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation1-desc</description>
+ <description xml:lang="de">de-entity2Annotation1-desc</description>
<annotation-class>entity2Annotation1Class</annotation-class>
<annotation-implementation-class>entity2Annotation1Impl</annotation-implementation-class>
@@ -1659,24 +1659,24 @@
<injection-target-name>entity2Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="entity2Annotation1Property1-id">
- <jee:description>en-entity2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation1Property1-desc</jee:description>
+ <description>en-entity2Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation1Property1-desc</description>
+ <description xml:lang="de">de-entity2Annotation1Property1-desc</description>
<property-name>entity2Annotation1Property1Name</property-name>
<property-value>entity2Annotation1Property1Value</property-value>
</property>
<property id="entity2Annotation1Property2-id">
- <jee:description>en-entity2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation1Property2-desc</jee:description>
+ <description>en-entity2Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation1Property2-desc</description>
+ <description xml:lang="de">de-entity2Annotation1Property2-desc</description>
<property-name>entity2Annotation1Property2Name</property-name>
<property-value>entity2Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="entity2Annotation2-id">
- <jee:description>en-entity2Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation2-desc</jee:description>
+ <description>en-entity2Annotation2-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation2-desc</description>
+ <description xml:lang="de">de-entity2Annotation2-desc</description>
<annotation-class>entity2Annotation2Class</annotation-class>
<annotation-implementation-class>entity2Annotation2Impl</annotation-implementation-class>
@@ -1685,25 +1685,25 @@
<injection-target-name>entity2Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="entity2Annotation2Property1-id">
- <jee:description>en-entity2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation2Property1-desc</jee:description>
+ <description>en-entity2Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation2Property1-desc</description>
+ <description xml:lang="de">de-entity2Annotation2Property1-desc</description>
<property-name>entity2Annotation2Property1Name</property-name>
<property-value>entity2Annotation2Property1Value</property-value>
</property>
<property id="entity2Annotation2Property2-id">
- <jee:description>en-entity2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2Annotation2Property2-desc</jee:description>
+ <description>en-entity2Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-entity2Annotation2Property2-desc</description>
+ <description xml:lang="de">de-entity2Annotation2Property2-desc</description>
<property-name>entity2Annotation2Property2Name</property-name>
<property-value>entity2Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="entity2IgnoreDependency-id">
- <jee:description>en-entity2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-entity2IgnoreDependency-desc</jee:description>
+ <description>en-entity2IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-entity2IgnoreDependency-desc</description>
+ <description xml:lang="de">de-entity2IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>entity2IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>entity2IgnoreDependencyInjection1Name</injection-target-name>
@@ -1721,9 +1721,9 @@
<!-- TODO pool config -->
<jndi-ref id="entity2JndiRef1-id">
- <jee:description>en-entity2JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-entity2JndiRef1-desc</jee:description>
+ <description>en-entity2JndiRef1-desc</description>
+ <description xml:lang="fr">fr-entity2JndiRef1-desc</description>
+ <description xml:lang="de">de-entity2JndiRef1-desc</description>
<jndi-ref-name>entity2JndiRef1Name</jndi-ref-name>
<mapped-name>entity2JndiRef1MappedName</mapped-name>
<injection-target>
@@ -1736,9 +1736,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="entity2JndiRef2-id">
- <jee:description>en-entity2JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-entity2JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-entity2JndiRef2-desc</jee:description>
+ <description>en-entity2JndiRef2-desc</description>
+ <description xml:lang="fr">fr-entity2JndiRef2-desc</description>
+ <description xml:lang="de">de-entity2JndiRef2-desc</description>
<jndi-ref-name>entity2JndiRef2Name</jndi-ref-name>
<mapped-name>entity2JndiRef2MappedName</mapped-name>
<injection-target>
@@ -1758,24 +1758,24 @@
</message-driven>
<message-driven id="mdb1-id">
- <jee:description>en-mdb1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1-desc</jee:description>
- <jee:display-name>en-mdb1-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-mdb1-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-mdb1-disp</jee:display-name>
- <jee:icon id="en-mdb1-icon-id">
- <jee:small-icon>en-mdb1-small-icon</jee:small-icon>
- <jee:large-icon>en-mdb1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-mdb1-icon-id">
- <jee:small-icon>fr-mdb1-small-icon</jee:small-icon>
- <jee:large-icon>fr-mdb1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-mdb1-icon-id">
- <jee:small-icon>de-mdb1-small-icon</jee:small-icon>
- <jee:large-icon>de-mdb1-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-mdb1-desc</description>
+ <description xml:lang="fr">fr-mdb1-desc</description>
+ <description xml:lang="de">de-mdb1-desc</description>
+ <display-name>en-mdb1-disp</display-name>
+ <display-name xml:lang="fr">fr-mdb1-disp</display-name>
+ <display-name xml:lang="de">de-mdb1-disp</display-name>
+ <icon id="en-mdb1-icon-id">
+ <small-icon>en-mdb1-small-icon</small-icon>
+ <large-icon>en-mdb1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-mdb1-icon-id">
+ <small-icon>fr-mdb1-small-icon</small-icon>
+ <large-icon>fr-mdb1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-mdb1-icon-id">
+ <small-icon>de-mdb1-small-icon</small-icon>
+ <large-icon>de-mdb1-large-icon</large-icon>
+ </icon>
<ejb-name>mdb1EjbName</ejb-name>
@@ -1791,23 +1791,23 @@
<configuration-name>mdb1ConfigurationName</configuration-name>
<invoker-bindings id="mdb1InvokerBindings-id">
- <jee:description>en-mdb1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1InvokerBindings-desc</jee:description>
+ <description>en-mdb1InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-mdb1InvokerBindings-desc</description>
+ <description xml:lang="de">de-mdb1InvokerBindings-desc</description>
<invoker id="mdb1Invoker1-id">
- <jee:description>en-mdb1Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Invoker1-desc</jee:description>
+ <description>en-mdb1Invoker1-desc</description>
+ <description xml:lang="fr">fr-mdb1Invoker1-desc</description>
+ <description xml:lang="de">de-mdb1Invoker1-desc</description>
<invoker-proxy-binding-name>mdb1Invoker1Name</invoker-proxy-binding-name>
<jndi-name>mdb1Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="mdb1Invoker2-id">
- <jee:description>en-mdb1Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Invoker2-desc</jee:description>
+ <description>en-mdb1Invoker2-desc</description>
+ <description xml:lang="fr">fr-mdb1Invoker2-desc</description>
+ <description xml:lang="de">de-mdb1Invoker2-desc</description>
<invoker-proxy-binding-name>mdb1Invoker2Name</invoker-proxy-binding-name>
<jndi-name>mdb1Invoker2JndiName</jndi-name>
@@ -1818,9 +1818,9 @@
<security-proxy>mdb1SecurityProxy</security-proxy>
<ejb-ref id="mdb1EjbRef1-id">
- <jee:description>en-mdb1EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1EjbRef1-desc</jee:description>
+ <description>en-mdb1EjbRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1EjbRef1-desc</description>
+ <description xml:lang="de">de-mdb1EjbRef1-desc</description>
<ejb-ref-name>mdb1EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -1835,9 +1835,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="mdb1EjbRef2-id">
- <jee:description>en-mdb1EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1EjbRef2-desc</jee:description>
+ <description>en-mdb1EjbRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1EjbRef2-desc</description>
+ <description xml:lang="de">de-mdb1EjbRef2-desc</description>
<ejb-ref-name>mdb1EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -1852,9 +1852,9 @@
</ejb-ref>
<ejb-local-ref id="mdb1EjbLocalRef1-id">
- <jee:description>en-mdb1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1EjbLocalRef1-desc</jee:description>
+ <description>en-mdb1EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-mdb1EjbLocalRef1-desc</description>
<ejb-ref-name>mdb1EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -1869,9 +1869,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="mdb1EjbLocalRef2-id">
- <jee:description>en-mdb1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1EjbLocalRef2-desc</jee:description>
+ <description>en-mdb1EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-mdb1EjbLocalRef2-desc</description>
<ejb-ref-name>mdb1EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -1887,17 +1887,10 @@
<!-- TODO service-ref -->
- <security-identity id="mdb1SecurityIdentity-id">
- <jee:description>en-mdb1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1SecurityIdentity-desc</jee:description>
- <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="mdb1ResourceRef1-id">
- <jee:description>en-mdb1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1ResourceRef1-desc</jee:description>
+ <description>en-mdb1ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1ResourceRef1-desc</description>
+ <description xml:lang="de">de-mdb1ResourceRef1-desc</description>
<res-ref-name>mdb1ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>mdb1ResourceRef1Injection1Class</injection-target-class>
@@ -1911,9 +1904,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="mdb1ResourceRef2-id">
- <jee:description>en-mdb1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1ResourceRef2-desc</jee:description>
+ <description>en-mdb1ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1ResourceRef2-desc</description>
+ <description xml:lang="de">de-mdb1ResourceRef2-desc</description>
<res-ref-name>mdb1ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>mdb1ResourceRef2Injection1Class</injection-target-class>
@@ -1926,9 +1919,9 @@
<jndi-name>mdb1ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="mdb1ResourceEnvRef1-id">
- <jee:description>en-mdb1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1ResourceEnvRef1-desc</jee:description>
+ <description>en-mdb1ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-mdb1ResourceEnvRef1-desc</description>
<resource-env-ref-name>mdb1ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>mdb1ResourceEnvRef1Injection1Class</injection-target-class>
@@ -1942,9 +1935,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="mdb1ResourceEnvRef2-id">
- <jee:description>en-mdb1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1ResourceEnvRef2-desc</jee:description>
+ <description>en-mdb1ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-mdb1ResourceEnvRef2-desc</description>
<resource-env-ref-name>mdb1ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>mdb1ResourceEnvRef2Injection1Class</injection-target-class>
@@ -1957,9 +1950,9 @@
<jndi-name>mdb1ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="mdb1MessageDestinationRef1-id">
- <jee:description>en-mdb1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1MessageDestinationRef1-desc</jee:description>
+ <description>en-mdb1MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-mdb1MessageDestinationRef1-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef1Injection1Class</injection-target-class>
@@ -1973,9 +1966,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="mdb1MessageDestinationRef2-id">
- <jee:description>en-mdb1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1MessageDestinationRef2-desc</jee:description>
+ <description>en-mdb1MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-mdb1MessageDestinationRef2-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef2Injection1Class</injection-target-class>
@@ -1988,9 +1981,9 @@
<jndi-name>mdb1MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="mdb1MessageDestinationRef3-id">
- <jee:description>en-mdb1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1MessageDestinationRef3-desc</jee:description>
+ <description>en-mdb1MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-mdb1MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-mdb1MessageDestinationRef3-desc</description>
<message-destination-ref-name>mdb1MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb1MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2015,17 +2008,24 @@
</method>
</method-attributes>
+ <security-identity id="mdb1SecurityIdentity-id">
+ <description>en-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
+ <run-as-principal>mdb1SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb1Depends1</depends>
<depends>mdb1Depends2</depends>
<ior-security-config id="mdb1IorSecurityConfig-id">
- <jee:description>en-mdb1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1IorSecurityConfig-desc</jee:description>
+ <description>en-mdb1IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-mdb1IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-mdb1IorSecurityConfig-desc</description>
<transport-config id="mdb1TransportConfig-id">
- <jee:description>en-mdb1TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1TransportConfig-desc</jee:description>
+ <description>en-mdb1TransportConfig-desc</description>
+ <description xml:lang="fr">fr-mdb1TransportConfig-desc</description>
+ <description xml:lang="de">de-mdb1TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2034,32 +2034,32 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="mdb1ASContext-id">
- <jee:description>en-mdb1ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1ASContext-desc</jee:description>
+ <description>en-mdb1ASContext-desc</description>
+ <description xml:lang="fr">fr-mdb1ASContext-desc</description>
+ <description xml:lang="de">de-mdb1ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>mdb1ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="mdb1SASContext-id">
- <jee:description>en-mdb1SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1SASContext-desc</jee:description>
+ <description>en-mdb1SASContext-desc</description>
+ <description xml:lang="fr">fr-mdb1SASContext-desc</description>
+ <description xml:lang="de">de-mdb1SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
<ejb-timeout-identity id="mdb1EjbTimeoutIdentity-id">
- <jee:description>en-mdb1EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</jee:description>
+ <description>en-mdb1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb1EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-mdb1EjbTimeoutIdentity-desc</description>
<run-as-principal>mdb1EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
</ejb-timeout-identity>
<annotation id="mdb1Annotation1-id">
- <jee:description>en-mdb1Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation1-desc</jee:description>
+ <description>en-mdb1Annotation1-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation1-desc</description>
+ <description xml:lang="de">de-mdb1Annotation1-desc</description>
<annotation-class>mdb1Annotation1Class</annotation-class>
<annotation-implementation-class>mdb1Annotation1Impl</annotation-implementation-class>
@@ -2068,24 +2068,24 @@
<injection-target-name>mdb1Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="mdb1Annotation1Property1-id">
- <jee:description>en-mdb1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation1Property1-desc</jee:description>
+ <description>en-mdb1Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation1Property1-desc</description>
+ <description xml:lang="de">de-mdb1Annotation1Property1-desc</description>
<property-name>mdb1Annotation1Property1Name</property-name>
<property-value>mdb1Annotation1Property1Value</property-value>
</property>
<property id="mdb1Annotation1Property2-id">
- <jee:description>en-mdb1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation1Property2-desc</jee:description>
+ <description>en-mdb1Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation1Property2-desc</description>
+ <description xml:lang="de">de-mdb1Annotation1Property2-desc</description>
<property-name>mdb1Annotation1Property2Name</property-name>
<property-value>mdb1Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="mdb1Annotation2-id">
- <jee:description>en-mdb1Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation2-desc</jee:description>
+ <description>en-mdb1Annotation2-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation2-desc</description>
+ <description xml:lang="de">de-mdb1Annotation2-desc</description>
<annotation-class>mdb1Annotation2Class</annotation-class>
<annotation-implementation-class>mdb1Annotation2Impl</annotation-implementation-class>
@@ -2094,25 +2094,25 @@
<injection-target-name>mdb1Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="mdb1Annotation2Property1-id">
- <jee:description>en-mdb1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation2Property1-desc</jee:description>
+ <description>en-mdb1Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation2Property1-desc</description>
+ <description xml:lang="de">de-mdb1Annotation2Property1-desc</description>
<property-name>mdb1Annotation2Property1Name</property-name>
<property-value>mdb1Annotation2Property1Value</property-value>
</property>
<property id="mdb1Annotation2Property2-id">
- <jee:description>en-mdb1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1Annotation2Property2-desc</jee:description>
+ <description>en-mdb1Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-mdb1Annotation2Property2-desc</description>
+ <description xml:lang="de">de-mdb1Annotation2Property2-desc</description>
<property-name>mdb1Annotation2Property2Name</property-name>
<property-value>mdb1Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="mdb1IgnoreDependency-id">
- <jee:description>en-mdb1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1IgnoreDependency-desc</jee:description>
+ <description>en-mdb1IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-mdb1IgnoreDependency-desc</description>
+ <description xml:lang="de">de-mdb1IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>mdb1IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>mdb1IgnoreDependencyInjection1Name</injection-target-name>
@@ -2128,9 +2128,9 @@
<!-- TODO pool config -->
<jndi-ref id="mdb1JndiRef1-id">
- <jee:description>en-mdb1JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1JndiRef1-desc</jee:description>
+ <description>en-mdb1JndiRef1-desc</description>
+ <description xml:lang="fr">fr-mdb1JndiRef1-desc</description>
+ <description xml:lang="de">de-mdb1JndiRef1-desc</description>
<jndi-ref-name>mdb1JndiRef1Name</jndi-ref-name>
<mapped-name>mdb1JndiRef1MappedName</mapped-name>
<injection-target>
@@ -2143,9 +2143,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="mdb1JndiRef2-id">
- <jee:description>en-mdb1JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb1JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb1JndiRef2-desc</jee:description>
+ <description>en-mdb1JndiRef2-desc</description>
+ <description xml:lang="fr">fr-mdb1JndiRef2-desc</description>
+ <description xml:lang="de">de-mdb1JndiRef2-desc</description>
<jndi-ref-name>mdb1JndiRef2Name</jndi-ref-name>
<mapped-name>mdb1JndiRef2MappedName</mapped-name>
<injection-target>
@@ -2172,24 +2172,24 @@
</message-driven>
<message-driven id="mdb2-id">
- <jee:description>en-mdb2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2-desc</jee:description>
- <jee:display-name>en-mdb2-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-mdb2-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-mdb2-disp</jee:display-name>
- <jee:icon id="en-mdb2-icon-id">
- <jee:small-icon>en-mdb2-small-icon</jee:small-icon>
- <jee:large-icon>en-mdb2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-mdb2-icon-id">
- <jee:small-icon>fr-mdb2-small-icon</jee:small-icon>
- <jee:large-icon>fr-mdb2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-mdb2-icon-id">
- <jee:small-icon>de-mdb2-small-icon</jee:small-icon>
- <jee:large-icon>de-mdb2-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-mdb2-desc</description>
+ <description xml:lang="fr">fr-mdb2-desc</description>
+ <description xml:lang="de">de-mdb2-desc</description>
+ <display-name>en-mdb2-disp</display-name>
+ <display-name xml:lang="fr">fr-mdb2-disp</display-name>
+ <display-name xml:lang="de">de-mdb2-disp</display-name>
+ <icon id="en-mdb2-icon-id">
+ <small-icon>en-mdb2-small-icon</small-icon>
+ <large-icon>en-mdb2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-mdb2-icon-id">
+ <small-icon>fr-mdb2-small-icon</small-icon>
+ <large-icon>fr-mdb2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-mdb2-icon-id">
+ <small-icon>de-mdb2-small-icon</small-icon>
+ <large-icon>de-mdb2-large-icon</large-icon>
+ </icon>
<ejb-name>mdb2EjbName</ejb-name>
@@ -2205,23 +2205,23 @@
<configuration-name>mdb2ConfigurationName</configuration-name>
<invoker-bindings id="mdb2InvokerBindings-id">
- <jee:description>en-mdb2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2InvokerBindings-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2InvokerBindings-desc</jee:description>
+ <description>en-mdb2InvokerBindings-desc</description>
+ <description xml:lang="fr">fr-mdb2InvokerBindings-desc</description>
+ <description xml:lang="de">de-mdb2InvokerBindings-desc</description>
<invoker id="mdb2Invoker1-id">
- <jee:description>en-mdb2Invoker1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Invoker1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Invoker1-desc</jee:description>
+ <description>en-mdb2Invoker1-desc</description>
+ <description xml:lang="fr">fr-mdb2Invoker1-desc</description>
+ <description xml:lang="de">de-mdb2Invoker1-desc</description>
<invoker-proxy-binding-name>mdb2Invoker1Name</invoker-proxy-binding-name>
<jndi-name>mdb2Invoker1JndiName</jndi-name>
<!-- TODO ejb-ref -->
</invoker>
<invoker id="mdb2Invoker2-id">
- <jee:description>en-mdb2Invoker2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Invoker2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Invoker2-desc</jee:description>
+ <description>en-mdb2Invoker2-desc</description>
+ <description xml:lang="fr">fr-mdb2Invoker2-desc</description>
+ <description xml:lang="de">de-mdb2Invoker2-desc</description>
<invoker-proxy-binding-name>mdb2Invoker2Name</invoker-proxy-binding-name>
<jndi-name>mdb2Invoker2JndiName</jndi-name>
@@ -2232,9 +2232,9 @@
<security-proxy>mdb2SecurityProxy</security-proxy>
<ejb-ref id="mdb2EjbRef1-id">
- <jee:description>en-mdb2EjbRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2EjbRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2EjbRef1-desc</jee:description>
+ <description>en-mdb2EjbRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2EjbRef1-desc</description>
+ <description xml:lang="de">de-mdb2EjbRef1-desc</description>
<ejb-ref-name>mdb2EjbRef1Name</ejb-ref-name>
<injection-target>
@@ -2249,9 +2249,9 @@
<ignore-dependency/>
</ejb-ref>
<ejb-ref id="mdb2EjbRef2-id">
- <jee:description>en-mdb2EjbRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2EjbRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2EjbRef2-desc</jee:description>
+ <description>en-mdb2EjbRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2EjbRef2-desc</description>
+ <description xml:lang="de">de-mdb2EjbRef2-desc</description>
<ejb-ref-name>mdb2EjbRef2Name</ejb-ref-name>
<injection-target>
@@ -2266,9 +2266,9 @@
</ejb-ref>
<ejb-local-ref id="mdb2EjbLocalRef1-id">
- <jee:description>en-mdb2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2EjbLocalRef1-desc</jee:description>
+ <description>en-mdb2EjbLocalRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2EjbLocalRef1-desc</description>
+ <description xml:lang="de">de-mdb2EjbLocalRef1-desc</description>
<ejb-ref-name>mdb2EjbLocalRef1Name</ejb-ref-name>
<injection-target>
@@ -2283,9 +2283,9 @@
<ignore-dependency/>
</ejb-local-ref>
<ejb-local-ref id="mdb2EjbLocalRef2-id">
- <jee:description>en-mdb2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2EjbLocalRef2-desc</jee:description>
+ <description>en-mdb2EjbLocalRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2EjbLocalRef2-desc</description>
+ <description xml:lang="de">de-mdb2EjbLocalRef2-desc</description>
<ejb-ref-name>mdb2EjbLocalRef2Name</ejb-ref-name>
<injection-target>
@@ -2301,17 +2301,10 @@
<!-- TODO service-ref -->
- <security-identity id="mdb2SecurityIdentity-id">
- <jee:description>en-mdb2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2SecurityIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2SecurityIdentity-desc</jee:description>
- <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
- </security-identity>
-
<resource-ref id="mdb2ResourceRef1-id">
- <jee:description>en-mdb2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2ResourceRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2ResourceRef1-desc</jee:description>
+ <description>en-mdb2ResourceRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2ResourceRef1-desc</description>
+ <description xml:lang="de">de-mdb2ResourceRef1-desc</description>
<res-ref-name>mdb2ResourceRef1Name</res-ref-name>
<injection-target>
<injection-target-class>mdb2ResourceRef1Injection1Class</injection-target-class>
@@ -2325,9 +2318,9 @@
<ignore-dependency/>
</resource-ref>
<resource-ref id="mdb2ResourceRef2-id">
- <jee:description>en-mdb2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2ResourceRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2ResourceRef2-desc</jee:description>
+ <description>en-mdb2ResourceRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2ResourceRef2-desc</description>
+ <description xml:lang="de">de-mdb2ResourceRef2-desc</description>
<res-ref-name>mdb2ResourceRef2Name</res-ref-name>
<injection-target>
<injection-target-class>mdb2ResourceRef2Injection1Class</injection-target-class>
@@ -2340,9 +2333,9 @@
<jndi-name>mdb2ResourceRef2JndiName</jndi-name>
</resource-ref>
<resource-env-ref id="mdb2ResourceEnvRef1-id">
- <jee:description>en-mdb2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2ResourceEnvRef1-desc</jee:description>
+ <description>en-mdb2ResourceEnvRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2ResourceEnvRef1-desc</description>
+ <description xml:lang="de">de-mdb2ResourceEnvRef1-desc</description>
<resource-env-ref-name>mdb2ResourceEnvRef1Name</resource-env-ref-name>
<injection-target>
<injection-target-class>mdb2ResourceEnvRef1Injection1Class</injection-target-class>
@@ -2356,9 +2349,9 @@
<ignore-dependency/>
</resource-env-ref>
<resource-env-ref id="mdb2ResourceEnvRef2-id">
- <jee:description>en-mdb2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2ResourceEnvRef2-desc</jee:description>
+ <description>en-mdb2ResourceEnvRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2ResourceEnvRef2-desc</description>
+ <description xml:lang="de">de-mdb2ResourceEnvRef2-desc</description>
<resource-env-ref-name>mdb2ResourceEnvRef2Name</resource-env-ref-name>
<injection-target>
<injection-target-class>mdb2ResourceEnvRef2Injection1Class</injection-target-class>
@@ -2371,9 +2364,9 @@
<jndi-name>mdb2ResourceEnvRef2JndiName</jndi-name>
</resource-env-ref>
<message-destination-ref id="mdb2MessageDestinationRef1-id">
- <jee:description>en-mdb2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2MessageDestinationRef1-desc</jee:description>
+ <description>en-mdb2MessageDestinationRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2MessageDestinationRef1-desc</description>
+ <description xml:lang="de">de-mdb2MessageDestinationRef1-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef1Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef1Injection1Class</injection-target-class>
@@ -2387,9 +2380,9 @@
<ignore-dependency/>
</message-destination-ref>
<message-destination-ref id="mdb2MessageDestinationRef2-id">
- <jee:description>en-mdb2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2MessageDestinationRef2-desc</jee:description>
+ <description>en-mdb2MessageDestinationRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2MessageDestinationRef2-desc</description>
+ <description xml:lang="de">de-mdb2MessageDestinationRef2-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef2Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef2Injection1Class</injection-target-class>
@@ -2402,9 +2395,9 @@
<jndi-name>mdb2MessageDestinationRef2JndiName</jndi-name>
</message-destination-ref>
<message-destination-ref id="mdb2MessageDestinationRef3-id">
- <jee:description>en-mdb2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2MessageDestinationRef3-desc</jee:description>
+ <description>en-mdb2MessageDestinationRef3-desc</description>
+ <description xml:lang="fr">fr-mdb2MessageDestinationRef3-desc</description>
+ <description xml:lang="de">de-mdb2MessageDestinationRef3-desc</description>
<message-destination-ref-name>mdb2MessageDestinationRef3Name</message-destination-ref-name>
<injection-target>
<injection-target-class>mdb2MessageDestinationRef3Injection1Class</injection-target-class>
@@ -2429,17 +2422,24 @@
</method>
</method-attributes>
+ <security-identity id="mdb2SecurityIdentity-id">
+ <description>en-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
+ <description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
+ <run-as-principal>mdb2SecurityIdentityRunAsPrincipal</run-as-principal>
+ </security-identity>
+
<depends>mdb2Depends1</depends>
<depends>mdb2Depends2</depends>
<ior-security-config id="mdb2IorSecurityConfig-id">
- <jee:description>en-mdb2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2IorSecurityConfig-desc</jee:description>
+ <description>en-mdb2IorSecurityConfig-desc</description>
+ <description xml:lang="fr">fr-mdb2IorSecurityConfig-desc</description>
+ <description xml:lang="de">de-mdb2IorSecurityConfig-desc</description>
<transport-config id="mdb2TransportConfig-id">
- <jee:description>en-mdb2TransportConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2TransportConfig-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2TransportConfig-desc</jee:description>
+ <description>en-mdb2TransportConfig-desc</description>
+ <description xml:lang="fr">fr-mdb2TransportConfig-desc</description>
+ <description xml:lang="de">de-mdb2TransportConfig-desc</description>
<integrity>NONE</integrity>
<confidentiality>NONE</confidentiality>
<establish-trust-in-target>NONE</establish-trust-in-target>
@@ -2448,32 +2448,32 @@
<detect-replay>NONE</detect-replay>
</transport-config>
<as-context id="mdb2ASContext-id">
- <jee:description>en-mdb2ASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2ASContext-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2ASContext-desc</jee:description>
+ <description>en-mdb2ASContext-desc</description>
+ <description xml:lang="fr">fr-mdb2ASContext-desc</description>
+ <description xml:lang="de">de-mdb2ASContext-desc</description>
<auth-method>USERNAME_PASSWORD</auth-method>
<realm>mdb2ASContextRealm</realm>
<required>false</required>
</as-context>
<sas-context id="mdb2SASContext-id">
- <jee:description>en-mdb2SASContext-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2SASContext-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2SASContext-desc</jee:description>
+ <description>en-mdb2SASContext-desc</description>
+ <description xml:lang="fr">fr-mdb2SASContext-desc</description>
+ <description xml:lang="de">de-mdb2SASContext-desc</description>
<caller-propagation>NONE</caller-propagation>
</sas-context>
</ior-security-config>
<ejb-timeout-identity id="mdb2EjbTimeoutIdentity-id">
- <jee:description>en-mdb2EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</jee:description>
+ <description>en-mdb2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="fr">fr-mdb2EjbTimeoutIdentity-desc</description>
+ <description xml:lang="de">de-mdb2EjbTimeoutIdentity-desc</description>
<run-as-principal>mdb2EjbTimeoutIdentityRunAsPrincipal</run-as-principal>
</ejb-timeout-identity>
<annotation id="mdb2Annotation1-id">
- <jee:description>en-mdb2Annotation1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation1-desc</jee:description>
+ <description>en-mdb2Annotation1-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation1-desc</description>
+ <description xml:lang="de">de-mdb2Annotation1-desc</description>
<annotation-class>mdb2Annotation1Class</annotation-class>
<annotation-implementation-class>mdb2Annotation1Impl</annotation-implementation-class>
@@ -2482,24 +2482,24 @@
<injection-target-name>mdb2Annotation1InjectionTargetName</injection-target-name>
</injection-target>
<property id="mdb2Annotation1Property1-id">
- <jee:description>en-mdb2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation1Property1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation1Property1-desc</jee:description>
+ <description>en-mdb2Annotation1Property1-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation1Property1-desc</description>
+ <description xml:lang="de">de-mdb2Annotation1Property1-desc</description>
<property-name>mdb2Annotation1Property1Name</property-name>
<property-value>mdb2Annotation1Property1Value</property-value>
</property>
<property id="mdb2Annotation1Property2-id">
- <jee:description>en-mdb2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation1Property2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation1Property2-desc</jee:description>
+ <description>en-mdb2Annotation1Property2-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation1Property2-desc</description>
+ <description xml:lang="de">de-mdb2Annotation1Property2-desc</description>
<property-name>mdb2Annotation1Property2Name</property-name>
<property-value>mdb2Annotation1Property2Value</property-value>
</property>
</annotation>
<annotation id="mdb2Annotation2-id">
- <jee:description>en-mdb2Annotation2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation2-desc</jee:description>
+ <description>en-mdb2Annotation2-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation2-desc</description>
+ <description xml:lang="de">de-mdb2Annotation2-desc</description>
<annotation-class>mdb2Annotation2Class</annotation-class>
<annotation-implementation-class>mdb2Annotation2Impl</annotation-implementation-class>
@@ -2508,25 +2508,25 @@
<injection-target-name>mdb2Annotation2InjectionTargetName</injection-target-name>
</injection-target>
<property id="mdb2Annotation2Property1-id">
- <jee:description>en-mdb2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation2Property1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation2Property1-desc</jee:description>
+ <description>en-mdb2Annotation2Property1-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation2Property1-desc</description>
+ <description xml:lang="de">de-mdb2Annotation2Property1-desc</description>
<property-name>mdb2Annotation2Property1Name</property-name>
<property-value>mdb2Annotation2Property1Value</property-value>
</property>
<property id="mdb2Annotation2Property2-id">
- <jee:description>en-mdb2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2Annotation2Property2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2Annotation2Property2-desc</jee:description>
+ <description>en-mdb2Annotation2Property2-desc</description>
+ <description xml:lang="fr">fr-mdb2Annotation2Property2-desc</description>
+ <description xml:lang="de">de-mdb2Annotation2Property2-desc</description>
<property-name>mdb2Annotation2Property2Name</property-name>
<property-value>mdb2Annotation2Property2Value</property-value>
</property>
</annotation>
<ignore-dependency id="mdb2IgnoreDependency-id">
- <jee:description>en-mdb2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2IgnoreDependency-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2IgnoreDependency-desc</jee:description>
+ <description>en-mdb2IgnoreDependency-desc</description>
+ <description xml:lang="fr">fr-mdb2IgnoreDependency-desc</description>
+ <description xml:lang="de">de-mdb2IgnoreDependency-desc</description>
<injection-target>
<injection-target-class>mdb2IgnoreDependencyInjection1Class</injection-target-class>
<injection-target-name>mdb2IgnoreDependencyInjection1Name</injection-target-name>
@@ -2542,9 +2542,9 @@
<!-- TODO pool config -->
<jndi-ref id="mdb2JndiRef1-id">
- <jee:description>en-mdb2JndiRef1-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2JndiRef1-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2JndiRef1-desc</jee:description>
+ <description>en-mdb2JndiRef1-desc</description>
+ <description xml:lang="fr">fr-mdb2JndiRef1-desc</description>
+ <description xml:lang="de">de-mdb2JndiRef1-desc</description>
<jndi-ref-name>mdb2JndiRef1Name</jndi-ref-name>
<mapped-name>mdb2JndiRef1MappedName</mapped-name>
<injection-target>
@@ -2557,9 +2557,9 @@
</injection-target>
</jndi-ref>
<jndi-ref id="mdb2JndiRef2-id">
- <jee:description>en-mdb2JndiRef2-desc</jee:description>
- <jee:description xml:lang="fr">fr-mdb2JndiRef2-desc</jee:description>
- <jee:description xml:lang="de">de-mdb2JndiRef2-desc</jee:description>
+ <description>en-mdb2JndiRef2-desc</description>
+ <description xml:lang="fr">fr-mdb2JndiRef2-desc</description>
+ <description xml:lang="de">de-mdb2JndiRef2-desc</description>
<jndi-ref-name>mdb2JndiRef2Name</jndi-ref-name>
<mapped-name>mdb2JndiRef2MappedName</mapped-name>
<injection-target>
@@ -2590,63 +2590,63 @@
<assembly-descriptor id="assembly-descriptor-id">
<security-role id="securityRole1-id">
- <jee:description>en-securityRole1-desc</jee:description>
- <jee:description xml:lang="fr">fr-securityRole1-desc</jee:description>
- <jee:description xml:lang="de">de-securityRole1-desc</jee:description>
+ <description>en-securityRole1-desc</description>
+ <description xml:lang="fr">fr-securityRole1-desc</description>
+ <description xml:lang="de">de-securityRole1-desc</description>
<role-name>securityRole1RoleName</role-name>
<principal>securityRole1Principal1</principal>
<principal>securityRole1Principal2</principal>
</security-role>
<security-role id="securityRole2-id">
- <jee:description>en-securityRole2-desc</jee:description>
- <jee:description xml:lang="fr">fr-securityRole2-desc</jee:description>
- <jee:description xml:lang="de">de-securityRole2-desc</jee:description>
+ <description>en-securityRole2-desc</description>
+ <description xml:lang="fr">fr-securityRole2-desc</description>
+ <description xml:lang="de">de-securityRole2-desc</description>
<role-name>securityRole2RoleName</role-name>
<principal>securityRole2Principal1</principal>
<principal>securityRole2Principal2</principal>
</security-role>
<message-destination id="messageDestination1-id">
- <jee:description>en-messageDestination1-desc</jee:description>
- <jee:description xml:lang="fr">fr-messageDestination1-desc</jee:description>
- <jee:description xml:lang="de">de-messageDestination1-desc</jee:description>
- <jee:display-name>en-messageDestination1-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-messageDestination1-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-messageDestination1-disp</jee:display-name>
- <jee:icon id="en-messageDestination1-icon-id">
- <jee:small-icon>en-messageDestination1-small-icon</jee:small-icon>
- <jee:large-icon>en-messageDestination1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-messageDestination1-icon-id">
- <jee:small-icon>fr-messageDestination1-small-icon</jee:small-icon>
- <jee:large-icon>fr-messageDestination1-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-messageDestination1-icon-id">
- <jee:small-icon>de-messageDestination1-small-icon</jee:small-icon>
- <jee:large-icon>de-messageDestination1-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-messageDestination1-desc</description>
+ <description xml:lang="fr">fr-messageDestination1-desc</description>
+ <description xml:lang="de">de-messageDestination1-desc</description>
+ <display-name>en-messageDestination1-disp</display-name>
+ <display-name xml:lang="fr">fr-messageDestination1-disp</display-name>
+ <display-name xml:lang="de">de-messageDestination1-disp</display-name>
+ <icon id="en-messageDestination1-icon-id">
+ <small-icon>en-messageDestination1-small-icon</small-icon>
+ <large-icon>en-messageDestination1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-messageDestination1-icon-id">
+ <small-icon>fr-messageDestination1-small-icon</small-icon>
+ <large-icon>fr-messageDestination1-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-messageDestination1-icon-id">
+ <small-icon>de-messageDestination1-small-icon</small-icon>
+ <large-icon>de-messageDestination1-large-icon</large-icon>
+ </icon>
<message-destination-name>messageDestination1Name</message-destination-name>
<jndi-name>messageDestination1JndiName</jndi-name>
</message-destination>
<message-destination id="messageDestination2-id">
- <jee:description>en-messageDestination2-desc</jee:description>
- <jee:description xml:lang="fr">fr-messageDestination2-desc</jee:description>
- <jee:description xml:lang="de">de-messageDestination2-desc</jee:description>
- <jee:display-name>en-messageDestination2-disp</jee:display-name>
- <jee:display-name xml:lang="fr">fr-messageDestination2-disp</jee:display-name>
- <jee:display-name xml:lang="de">de-messageDestination2-disp</jee:display-name>
- <jee:icon id="en-messageDestination2-icon-id">
- <jee:small-icon>en-messageDestination2-small-icon</jee:small-icon>
- <jee:large-icon>en-messageDestination2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="fr" id="fr-messageDestination2-icon-id">
- <jee:small-icon>fr-messageDestination2-small-icon</jee:small-icon>
- <jee:large-icon>fr-messageDestination2-large-icon</jee:large-icon>
- </jee:icon>
- <jee:icon xml:lang="de" id="de-messageDestination2-icon-id">
- <jee:small-icon>de-messageDestination2-small-icon</jee:small-icon>
- <jee:large-icon>de-messageDestination2-large-icon</jee:large-icon>
- </jee:icon>
+ <description>en-messageDestination2-desc</description>
+ <description xml:lang="fr">fr-messageDestination2-desc</description>
+ <description xml:lang="de">de-messageDestination2-desc</description>
+ <display-name>en-messageDestination2-disp</display-name>
+ <display-name xml:lang="fr">fr-messageDestination2-disp</display-name>
+ <display-name xml:lang="de">de-messageDestination2-disp</display-name>
+ <icon id="en-messageDestination2-icon-id">
+ <small-icon>en-messageDestination2-small-icon</small-icon>
+ <large-icon>en-messageDestination2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-messageDestination2-icon-id">
+ <small-icon>fr-messageDestination2-small-icon</small-icon>
+ <large-icon>fr-messageDestination2-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-messageDestination2-icon-id">
+ <small-icon>de-messageDestination2-small-icon</small-icon>
+ <large-icon>de-messageDestination2-large-icon</large-icon>
+ </icon>
<message-destination-name>messageDestination2Name</message-destination-name>
<jndi-name>messageDestination2JndiName</jndi-name>
</message-destination>
@@ -2654,29 +2654,29 @@
</assembly-descriptor>
<resource-managers id="resource-managers-id">
- <jee:description>en-resource-managers-desc</jee:description>
- <jee:description xml:lang="fr">fr-resource-managers-desc</jee:description>
- <jee:description xml:lang="de">de-resource-managers-desc</jee:description>
+ <description>en-resource-managers-desc</description>
+ <description xml:lang="fr">fr-resource-managers-desc</description>
+ <description xml:lang="de">de-resource-managers-desc</description>
<resource-manager id="resourceManager1-id" res-class="resourceManager1Class">
- <jee:description>en-resourceManager1-desc</jee:description>
- <jee:description xml:lang="fr">fr-resourceManager1-desc</jee:description>
- <jee:description xml:lang="de">de-resourceManager1-desc</jee:description>
+ <description>en-resourceManager1-desc</description>
+ <description xml:lang="fr">fr-resourceManager1-desc</description>
+ <description xml:lang="de">de-resourceManager1-desc</description>
<res-name>resourceManager1Name</res-name>
<res-jndi-name>resourceManager1JndiName</res-jndi-name>
</resource-manager>
<resource-manager id="resourceManager2-id" res-class="resourceManager2Class">
- <jee:description>en-resourceManager2-desc</jee:description>
- <jee:description xml:lang="fr">fr-resourceManager2-desc</jee:description>
- <jee:description xml:lang="de">de-resourceManager2-desc</jee:description>
+ <description>en-resourceManager2-desc</description>
+ <description xml:lang="fr">fr-resourceManager2-desc</description>
+ <description xml:lang="de">de-resourceManager2-desc</description>
<res-name>resourceManager2Name</res-name>
<res-url>resourceManager2URL</res-url>
</resource-manager>
</resource-managers>
<invoker-proxy-bindings id="invoker-proxy-bindings-id">
- <jee:description>en-invoker-proxy-bindings-desc</jee:description>
- <jee:description xml:lang="fr">fr-invoker-proxy-bindings-desc</jee:description>
- <jee:description xml:lang="de">de-invoker-proxy-bindings-desc</jee:description>
+ <description>en-invoker-proxy-bindings-desc</description>
+ <description xml:lang="fr">fr-invoker-proxy-bindings-desc</description>
+ <description xml:lang="de">de-invoker-proxy-bindings-desc</description>
<invoker-proxy-binding id="invokerProxyBinding1-id-override">
<invoker-proxy-binding-name>invokerProxyBinding1Name-override</invoker-proxy-binding-name>
<invoker-mbean>invokerProxyBinding1InvokerMBean-override</invoker-mbean>
@@ -2778,9 +2778,9 @@
</container-configuration>
<container-configuration id="containerConfiguration2-id" extends="containerConfiguration2Extends">
- <jee:description>en-containerConfiguration2-desc</jee:description>
- <jee:description xml:lang="fr">fr-containerConfiguration2-desc</jee:description>
- <jee:description xml:lang="de">de-containerConfiguration2-desc</jee:description>
+ <description>en-containerConfiguration2-desc</description>
+ <description xml:lang="fr">fr-containerConfiguration2-desc</description>
+ <description xml:lang="de">de-containerConfiguration2-desc</description>
<container-name>containerConfiguration2Name</container-name>
<call-logging>false</call-logging>
<invoker-proxy-binding-name>containerConfiguration2InvokerProxyBindingName1</invoker-proxy-binding-name>
@@ -2825,9 +2825,9 @@
<optiond-refresh-rate>10</optiond-refresh-rate>
<security-domain>containerConfiguration2SecurityDomain</security-domain>
<cluster-config id="containerConfiguration2ClusterConfig-id">
- <jee:description>en-containerConfiguration2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</jee:description>
- <jee:description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</jee:description>
+ <description>en-containerConfiguration2ClusterConfig-desc</description>
+ <description xml:lang="fr">fr-containerConfiguration2ClusterConfig-desc</description>
+ <description xml:lang="de">de-containerConfiguration2ClusterConfig-desc</description>
<partition-name>containerConfiguration2ClusterConfigPartitionName</partition-name>
<home-load-balancing-policy>containerConfiguration2ClusterConfigHomeLoadBalancingPolicy</home-load-balancing-policy>
<bean-load-balancing-policy>containerConfiguration2ClusterConfigBeanLoadBalancingPolicy</bean-load-balancing-policy>
More information about the jboss-cvs-commits
mailing list