[jboss-cvs] JBossAS SVN: r72036 - in projects/metadata/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 11 12:11:09 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-04-11 12:11:09 -0400 (Fri, 11 Apr 2008)
New Revision: 72036
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testJndiBindingPolicy.xml
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/JBossMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java
Log:
JBMETA-6
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 2008-04-11 16:02:20 UTC (rev 72035)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2008-04-11 16:11:09 UTC (rev 72036)
@@ -175,6 +175,9 @@
/** The transaction type */
private TransactionManagementType transactionType;
+ /** the class name that implements the JNDI binding policy for this ejb */
+ private String jndiBindingPolicy;
+
/**
* Create the correct JBossEnterpriseBeanMetaData for the input
* standard bean metadata.
@@ -1536,4 +1539,13 @@
return ejbJar.getAssemblyDescriptor();
}
+ public String getJndiBindingPolicy()
+ {
+ return jndiBindingPolicy;
+ }
+
+ public void setJndiBindingPolicy(String jndiBindingPolicy)
+ {
+ this.jndiBindingPolicy = jndiBindingPolicy;
+ }
}
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 2008-04-11 16:02:20 UTC (rev 72035)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java 2008-04-11 16:11:09 UTC (rev 72036)
@@ -118,6 +118,9 @@
/** Is this a complete metadata description */
private boolean metadataComplete;
+ /** the class name that implements the default JNDI binding policy for this ejb unit*/
+ private String jndiBindingPolicy;
+
/**
* Create a new JBossMetaData.
*/
@@ -591,6 +594,16 @@
this.assemblyDescriptor = assemblyDescriptor;
}
+ public String getJndiBindingPolicy()
+ {
+ return jndiBindingPolicy;
+ }
+
+ public void setJndiBindingPolicy(String jndiBindingPolicy)
+ {
+ this.jndiBindingPolicy = jndiBindingPolicy;
+ }
+
/**
* Access the RunAsIdentity associated with the given servlet
* @param ejbName - the servlet-name from the web.xml
Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-04-11 16:02:20 UTC (rev 72035)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_0.xsd 2008-04-11 16:11:09 UTC (rev 72036)
@@ -106,6 +106,7 @@
<xsd:element name="security-domain" type="jboss:security-domainType" minOccurs="0"/>
<xsd:element name="missing-method-permissions-excluded-mode" type="jboss:missing-method-permissions-excluded-modeType" minOccurs="0"/>
<xsd:element name="unauthenticated-principal" type="jboss:unauthenticated-principalType" minOccurs="0"/>
+ <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="webservices" type="jboss:webservices-type" minOccurs="0" maxOccurs="1"/>
<xsd:element name="enterprise-beans" type="jboss:enterprise-beansType" minOccurs="0"/>
<xsd:element name="assembly-descriptor" type="jboss:assembly-descriptorType" minOccurs="0"/>
@@ -404,6 +405,7 @@
<xsd:element name="destination-jndi-name" type="jboss:destination-jndi-nameType"
minOccurs="0"/>
<xsd:element name="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
+ <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="mdb-user" type="jboss:mdb-userType" minOccurs="0"/>
<xsd:element name="mdb-passwd" type="jboss:mdb-passwdType" minOccurs="0"/>
<xsd:element name="mdb-client-id" type="jboss:mdb-client-idType" minOccurs="0"/>
@@ -749,6 +751,7 @@
<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="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
+ <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" 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"
@@ -822,6 +825,7 @@
<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="local-jndi-name" type="jboss:local-jndi-nameType" minOccurs="0"/>
+ <xsd:element name="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<xsd:element name="security-domain" type="javaee:xsdStringType" minOccurs="0"/>
<xsd:element name="method-attributes" type="jboss:method-attributesType" minOccurs="0"/>
<xsd:element name="depends" type="javaee:xsdStringType" minOccurs="0" maxOccurs="unbounded"/>
@@ -924,6 +928,7 @@
<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="jndi-binding-policy" type="jboss:jndi-binding-policyType" minOccurs="0"/>
<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"/>
@@ -1780,6 +1785,7 @@
<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="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>
</xsd:complexType>
@@ -1971,4 +1977,20 @@
</xsd:sequence>
</xsd:group>
+ <xsd:complexType name="jndi-binding-policyType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The jndiBindingPolicyType defines the fully-qualified name of
+ a class that implements the JNDI binding policy.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="javaee:fully-qualified-classType"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
</xsd:schema>
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 2008-04-11 16:02:20 UTC (rev 72035)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/JBoss50UnitTestCase.java 2008-04-11 16:11:09 UTC (rev 72036)
@@ -960,7 +960,29 @@
assertEquals("HomeLBP", clusterConfig.getHomeLoadBalancePolicy());
}
+ public void testJndiBindingPolicy() throws Exception
+ {
+ JBossXBTestDelegate xbdelegate = (JBossXBTestDelegate) super.getDelegate();
+ xbdelegate.setValidateSchema(true);
+ JBossMetaData jbossXmlMetaData = unmarshal();
+ assertEquals("org.jboss.metadata.test.AppJndiBindingPolicy", jbossXmlMetaData.getJndiBindingPolicy());
+ JBossEnterpriseBeansMetaData enterpriseBeans = jbossXmlMetaData.getEnterpriseBeans();
+ assertNotNull(enterpriseBeans);
+ assertEquals(3, enterpriseBeans.size());
+ JBossEnterpriseBeanMetaData ejb = enterpriseBeans.get("EjbBean");
+ assertNotNull(ejb);
+ assertEquals("org.jboss.metadata.test.EjbJndiBindingPolicy", ejb.getJndiBindingPolicy());
+
+ ejb = enterpriseBeans.get("MdbName");
+ assertNotNull(ejb);
+ assertEquals("org.jboss.metadata.test.MdbJndiBindingPolicy", ejb.getJndiBindingPolicy());
+
+ ejb = enterpriseBeans.get("SessionBean");
+ assertNotNull(ejb);
+ assertEquals("org.jboss.metadata.test.SessionJndiBindingPolicy", ejb.getJndiBindingPolicy());
+ }
+
private <T> Set<T> toSet(T ... obj)
{
Set<T> set = new HashSet<T>();
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testJndiBindingPolicy.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testJndiBindingPolicy.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss50_testJndiBindingPolicy.xml 2008-04-11 16:11:09 UTC (rev 72036)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+ <jndi-binding-policy>org.jboss.metadata.test.AppJndiBindingPolicy</jndi-binding-policy>
+ <enterprise-beans>
+ <ejb>
+ <ejb-name>EjbBean</ejb-name>
+ <jndi-name>servlet_annotation_StatelessTestBean</jndi-name>
+ <jndi-binding-policy>org.jboss.metadata.test.EjbJndiBindingPolicy</jndi-binding-policy>
+ </ejb>
+ <message-driven>
+ <ejb-name>MdbName</ejb-name>
+ <destination-jndi-name>MDB_QUEUE_BMT_DEST</destination-jndi-name>
+ <jndi-binding-policy>org.jboss.metadata.test.MdbJndiBindingPolicy</jndi-binding-policy>
+ </message-driven>
+ <session>
+ <ejb-name>SessionBean</ejb-name>
+ <jndi-binding-policy>org.jboss.metadata.test.SessionJndiBindingPolicy</jndi-binding-policy>
+ </session>
+ </enterprise-beans>
+</jboss>
More information about the jboss-cvs-commits
mailing list