[jboss-cvs] JBossAS SVN: r74975 - in projects/metadata/trunk/src/main: resources/schema and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 24 08:38:43 EDT 2008
Author: wolfc
Date: 2008-06-24 08:38:43 -0400 (Tue, 24 Jun 2008)
New Revision: 74975
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionGenericWrapper.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
Log:
JBMETA-66: allow home-jndi-name and local-home-jndi-name in generic bean definition
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java 2008-06-24 12:38:04 UTC (rev 74974)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossGenericBeanMetaData.java 2008-06-24 12:38:43 UTC (rev 74975)
@@ -37,6 +37,12 @@
{
private static final long serialVersionUID = 1L;
+ /** The jndi name for the EJB 2 remote home interface */
+ private String homeJndiName;
+
+ /** The jndi name for the EJB 2 local home interface */
+ private String localHomeJndiName;
+
/** The webservices port-component */
private PortComponent portComponent;
@@ -66,6 +72,16 @@
return getJndiName();
}
+ public String getHomeJndiName()
+ {
+ return homeJndiName;
+ }
+
+ public void setHomeJndiName(String s)
+ {
+ this.homeJndiName = s;
+ }
+
/**
* Get the jndiName.
*
@@ -87,6 +103,16 @@
super.setMappedName(jndiName);
}
+ public String getLocalHomeJndiName()
+ {
+ return localHomeJndiName;
+ }
+
+ public void setLocalHomeJndiName(String s)
+ {
+ this.localHomeJndiName = s;
+ }
+
public PortComponent getPortComponent()
{
return portComponent;
@@ -102,4 +128,16 @@
{
return true;
}
+
+ /**
+ * Don't call this method.
+ *
+ * During a merge on JBossEnterpriseBeansMetaData it will translate a JBossGenericBeanMetaData
+ * into the proper wrapper.
+ */
+ @Override
+ public void merge(JBossEnterpriseBeanMetaData override, JBossEnterpriseBeanMetaData original)
+ {
+ throw new RuntimeException("Merging two JBossGenericBeanMetaData objects is not supported, JBossEnterpriseBeansMetaData should have converted them");
+ }
}
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 2008-06-24 12:38:04 UTC (rev 74974)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java 2008-06-24 12:38:43 UTC (rev 74975)
@@ -904,11 +904,11 @@
if(joverride.getJndiName() != null)
jndiName = joverride.getJndiName();
// homeJndiName
- if(joverride.homeJndiName != null)
- homeJndiName = joverride.homeJndiName;
+ if(joverride.getHomeJndiName() != null)
+ homeJndiName = joverride.getHomeJndiName();
// localHomeJndiName
- if(joverride.localHomeJndiName != null)
- localHomeJndiName = joverride.localHomeJndiName;
+ if(joverride.getLocalHomeJndiName() != null)
+ localHomeJndiName = joverride.getLocalHomeJndiName();
// callByValue
callByValue = joverride.isCallByValue();
// clustered
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionGenericWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionGenericWrapper.java 2008-06-24 12:38:04 UTC (rev 74974)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionGenericWrapper.java 2008-06-24 12:38:43 UTC (rev 74975)
@@ -22,11 +22,13 @@
package org.jboss.metadata.ejb.jboss;
import java.lang.reflect.Method;
+import java.util.Map;
import java.util.Set;
import javax.ejb.TransactionAttributeType;
import javax.ejb.TransactionManagementType;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.MethodInterfaceType;
@@ -76,6 +78,19 @@
{
this.delegate = delegate;
}
+ public void checkValid()
+ {
+ delegate.checkValid();
+ }
+// public IdMetaDataImpl clone()
+// {
+// return delegate.clone();
+// }
+ public DefaultJndiBindingPolicy createPolicy(ClassLoader loader,
+ Class<? extends DefaultJndiBindingPolicy> defaultPolicyClass) throws Exception
+ {
+ return delegate.createPolicy(loader, defaultPolicyClass);
+ }
public Set<String> determineAllDepends()
{
return delegate.determineAllDepends();
@@ -88,6 +103,10 @@
{
return delegate.determineContainerConfiguration();
}
+ public String determineContainerName()
+ {
+ return delegate.determineContainerName();
+ }
public InvokerBindingMetaData determineInvokerBinding(String invokerName)
{
return delegate.determineInvokerBinding(invokerName);
@@ -96,10 +115,22 @@
{
return delegate.determineInvokerBindings();
}
+ public String determineJndiName()
+ {
+ return delegate.determineJndiName();
+ }
public String determineLocalJndiName()
{
return delegate.determineLocalJndiName();
}
+ public String determineResolvedJndiName(String iface, DefaultJndiBindingPolicy defaultPolicy)
+ {
+ return delegate.determineResolvedJndiName(iface, defaultPolicy);
+ }
+ public String determineResolvedJndiName(String iface)
+ {
+ return delegate.determineResolvedJndiName(iface);
+ }
public boolean equals(Object obj)
{
return delegate.equals(obj);
@@ -120,6 +151,10 @@
{
return delegate.getConfigurationName();
}
+ public String getContainerName()
+ {
+ return delegate.getContainerName();
+ }
public String getContainerObjectNameJndiName()
{
return delegate.getContainerObjectNameJndiName();
@@ -184,6 +219,14 @@
{
return delegate.getExcludeList();
}
+ public String getGeneratedContainerName()
+ {
+ return delegate.getGeneratedContainerName();
+ }
+ public String getHomeJndiName()
+ {
+ return delegate.getHomeJndiName();
+ }
public String getId()
{
return delegate.getId();
@@ -208,6 +251,10 @@
{
return delegate.getJBossMetaDataWithCheck();
}
+ public String getJndiBindingPolicy()
+ {
+ return delegate.getJndiBindingPolicy();
+ }
public Environment getJndiEnvironmentRefsGroup()
{
return delegate.getJndiEnvironmentRefsGroup();
@@ -224,6 +271,10 @@
{
return delegate.getKey();
}
+ public String getLocalHomeJndiName()
+ {
+ return delegate.getLocalHomeJndiName();
+ }
public String getLocalJndiName()
{
return delegate.getLocalJndiName();
@@ -232,8 +283,7 @@
{
return delegate.getMappedName();
}
- public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(
- String name)
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
{
return delegate.getMessageDestinationReferenceByName(name);
}
@@ -249,8 +299,7 @@
{
return delegate.getMethodPermissions();
}
- public Set<String> getMethodPermissions(String methodName,
- Class<?>[] params, MethodInterfaceType interfaceType)
+ public Set<String> getMethodPermissions(String methodName, Class<?>[] params, MethodInterfaceType interfaceType)
{
return delegate.getMethodPermissions(methodName, params, interfaceType);
}
@@ -262,13 +311,12 @@
{
return delegate.getMethodTransactionTimeout(methodName);
}
- public TransactionAttributeType getMethodTransactionType(Method m,
- MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(Method m, MethodInterfaceType iface)
{
return delegate.getMethodTransactionType(m, iface);
}
- public TransactionAttributeType getMethodTransactionType(String methodName,
- Class<?>[] params, MethodInterfaceType iface)
+ public TransactionAttributeType getMethodTransactionType(String methodName, Class<?>[] params,
+ MethodInterfaceType iface)
{
return delegate.getMethodTransactionType(methodName, params, iface);
}
@@ -276,8 +324,7 @@
{
return delegate.getName();
}
- public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(
- String name)
+ public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name)
{
return delegate.getPersistenceContextReferenceByName(name);
}
@@ -285,8 +332,7 @@
{
return delegate.getPersistenceContextRefs();
}
- public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(
- String name)
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
{
return delegate.getPersistenceUnitReferenceByName(name);
}
@@ -310,8 +356,7 @@
{
return delegate.getPreDestroys();
}
- public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(
- String name)
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
{
return delegate.getResourceEnvironmentReferenceByName(name);
}
@@ -351,6 +396,10 @@
{
return delegate.getSecurityRoleRefs();
}
+ public Map<String, Set<String>> getSecurityRolesPrincipalVersusRolesMap()
+ {
+ return delegate.getSecurityRolesPrincipalVersusRolesMap();
+ }
public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return delegate.getServiceReferenceByName(name);
@@ -367,8 +416,7 @@
{
return delegate.hashCode();
}
- public boolean hasMethodPermissions(String methodName, Class<?>[] params,
- MethodInterfaceType interfaceType)
+ public boolean hasMethodPermissions(String methodName, Class<?>[] params, MethodInterfaceType interfaceType)
{
return delegate.hasMethodPermissions(methodName, params, interfaceType);
}
@@ -392,6 +440,10 @@
{
return delegate.isExceptionOnRollback();
}
+ public boolean isGeneric()
+ {
+ return delegate.isGeneric();
+ }
public boolean isMessageDriven()
{
return delegate.isMessageDriven();
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-06-24 12:38:04 UTC (rev 74974)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-06-24 12:38:43 UTC (rev 74975)
@@ -1785,6 +1785,8 @@
<xsd:group ref="jboss:jndiEnvironmentRefsGroup"/>
<xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
<xsd:element name="jndi-name" type="javaee:jndi-nameType" 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="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="port-component" type="jboss:port-component-type" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
More information about the jboss-cvs-commits
mailing list