[jboss-cvs] JBossAS SVN: r99498 - in trunk: component-matrix and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 15 13:22:47 EST 2010
Author: jaikiran
Date: 2010-01-15 13:22:47 -0500 (Fri, 15 Jan 2010)
New Revision: 99498
Added:
trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
Removed:
trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/ejb3/pom.xml
trunk/server/pom.xml
trunk/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
trunk/webservices/pom.xml
Log:
JBAS-7622, JBAS-7623, JBAS-7472 - Upgraded jboss-metadata-ejb to 2.0.0-alpha-5, Upgraded jboss-ejb3_1 to 1.0.1. Also changed the implementation of MappedReferenceMetaDataResolverDeployer to use the newly introduced jndi name resolvers, instead of the earlier deprecated decorated metadata APIs
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/build/build.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -728,6 +728,11 @@
<fileset dir="${ejb3.module.output}">
<include name="ejb3.deployer/**"/>
</fileset>
+ <fileset dir="${ejb3.module.output}">
+ <include name="ejb3-deployers-jboss-beans.xml"/>
+ <include name="ejb3-nointerface-jboss-beans.xml"/>
+ <include name="ejb3-metadata-deployers-jboss-beans.xml"/>
+ </fileset>
</copy>
</target>
@@ -1997,13 +2002,16 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-interceptors:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-jpa-int:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-metadata:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-metadata-deployers:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-mc-int:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-nointerface:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3_1:jar"/>
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming:jar"/>
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming-deployers:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/component-matrix/pom.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -85,7 +85,7 @@
<version.org.jboss.deployers>2.2.0.Alpha1</version.org.jboss.deployers>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.ejb3.common.client>1.0.1</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.core.client>1.1.22</version.org.jboss.ejb3.core.client>
+ <version.org.jboss.ejb3.core.client>1.2.0</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
<version.org.jboss.ejb3.jpa.int>2.0.0-alpha-1</version.org.jboss.ejb3.jpa.int>
<version.org.jboss.ejb3.mc.int>1.0.2</version.org.jboss.ejb3.mc.int>
@@ -94,7 +94,7 @@
<version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
<version.org.jboss.ejb3.proxy.clustered.client>1.0.2</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
- <version.org.jboss.ejb3>1.0.0</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3>1.0.1</version.org.jboss.ejb3>
<version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta3</version.org.jboss.jbossxb>
<version.org.jboss.jpa.deployers>1.0.1</version.org.jboss.jpa.deployers>
@@ -111,7 +111,7 @@
<version.org.jboss.metadata.common>2.0.0-alpha-10</version.org.jboss.metadata.common>
<version.org.jboss.metadata.client>2.0.0.Alpha</version.org.jboss.metadata.client>
<version.org.jboss.metadata.ear>2.0.0.Alpha</version.org.jboss.metadata.ear>
- <version.org.jboss.metadata.ejb>2.0.0-alpha-4</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-5</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha13</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.Beta1</version.org.jboss.mod_cluster>
@@ -1863,7 +1863,6 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3_1</artifactId>
<version>${version.org.jboss.ejb3}</version>
- <type>pom</type>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/ejb3/pom.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -75,24 +75,46 @@
<include name="**"/>
</fileset>
</copy>
-
<unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-core.jar.path}" dest="target/resources">
<patternset>
<include name="*.xml" />
- <exclude name="META-INF/*.xml" />
+ <include name="META-INF/ejb3-deployers-jboss-beans.xml" />
+ <exclude name="META-INF/jpa-deployers-jboss-beans.xml" />
<include name="META-INF/*.properties" />
</patternset>
</unjar>
-
+
+ <mkdir dir="target/resources/deployers"/>
+ <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-deployers.jar.path}" dest="target/resources/deployers">
+ <patternset>
+ <include name="META-INF/ejb3-deployers-jboss-beans.xml" />
+ </patternset>
+ </unjar>
+ <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-nointerface.jar.path}" dest="target/resources">
+ <patternset>
+ <include name="META-INF/ejb3-nointerface-jboss-beans.xml" />
+ </patternset>
+ </unjar>
+ <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-metadata-deployers.jar.path}" dest="target/resources">
+ <patternset>
+ <include name="META-INF/ejb3-metadata-deployers-jboss-beans.xml" />
+ </patternset>
+ </unjar>
+
<mkdir dir="target/ejb3.deployer"/>
<copy todir="target/ejb3.deployer">
<fileset dir="target">
<include name="jboss-as-ejb3-deployer.jar"/>
</fileset>
<fileset dir="target/resources">
- <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
+ <include name="META-INF/ejb3-as-deployers-jboss-beans.xml"/>
<include name="META-INF/jpa-deployers-jboss-beans.xml"/>
+
</fileset>
+ <fileset dir="target/resources">
+ <!-- the one from ejb3-core/META-INF -->
+ <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
+ </fileset>
<fileset dir="target/resources">
<include name="META-INF/persistence.properties"/>
</fileset>
@@ -104,6 +126,14 @@
<include name="ejb3-connectors-jboss-beans.xml"/>
<include name="ejb3-interceptors-aop.xml"/>
</fileset>
+ <fileset dir="target/resources/META-INF">
+ <include name="ejb3-nointerface-jboss-beans.xml" />
+ <include name="ejb3-metadata-deployers-jboss-beans.xml" />
+ </fileset>
+ <fileset dir="target/resources/deployers/META-INF">
+ <include name="ejb3-deployers-jboss-beans.xml" />
+ </fileset>
+
</copy>
</tasks>
@@ -196,7 +226,6 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3_1</artifactId>
- <type>pom</type>
<exclusions>
<!-- JBAS-679, may be removed when as-int is >= 1.1.5 -->
<exclusion>
Added: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml (rev 0)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ EJB3 Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+
+ <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
+ <!-- TODO: allow for configuration
+ <property name="dependencies">
+ <dependency xmlns="urn:jboss:dependency:1.0">
+ <item>javax.transaction.TransactionManager</item>
+ </dependency>
+ </property>
+ -->
+ </bean>
+
+ <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
+ <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ <parameter>
+ <value>3.*</value>
+ </parameter>
+ <parameter>
+ <value>getEjbVersion</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ </uninstall>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
+ <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
+ <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
+ <!-- Should war deployments be scanned for annotated ejbs -->
+ <property name="scanWars">false</property>
+
+ <!--
+
+ Configure the deployer to optionally require a deployment
+ descriptor for deployable units. By turning this switch to "true",
+ "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
+ will be required for deployment, enabling a performance increace in deployment by
+ not scanning for annotations in non-deployable EJB3 JARs.
+
+ Default for this value is "false".
+
+ -->
+ <property name="deploymentDescriptorRequired">false</property>
+
+ <property name="ignoredJarsSet">
+ <set elementClass="java.lang.String">
+ <value>snmp-adaptor.jar</value>
+ <value>otherimages.jar</value>
+ <value>applet.jar</value>
+ <value>jcommon.jar</value>
+ <value>console-mgr-classes.jar</value>
+ <value>jfreechart.jar</value>
+ <value>juddi-service.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-pool.jar</value>
+ <value>juddi.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>uddi4j.jar</value>
+ <value>axis.jar</value>
+ <value>commons-dbcp.jar</value>
+ <value>jboss-juddiaxis.jar</value>
+ <value>trove.jar</value>
+ <value>javassist.jar</value>
+ <value>jboss-aop-jdk50.jar</value>
+ <value>jboss-aspect-library-jdk50.jar</value>
+ <value>jpa-api.jar</value>
+ <value>commons-validator-1.1.3.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-fileupload.jar</value>
+ <value>commons-pool.jar</value>
+ <value>hibernate-entitymanager.jar</value>
+ <value>jboss-ejb3x.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>cglib-2.1.1.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>jboss-annotations-ejb3.jar</value>
+ <value>jaxen-1.1-beta-4.jar</value>
+ <value>hibernate-annotations.jar</value>
+ <value>commons-httpclient.jar</value>
+ <value>commons-logging.jar</value>
+ <value>commons-vfs.jar</value>
+ <value>hibernate3.jar</value>
+ <value>commons-logging-api.jar</value>
+ <value>asm.jar</value>
+ <value>asm-attrs.jar</value>
+ <value>commons-lang-2.0.jar</value>
+ <value>jboss-ejb3.jar</value>
+ <value>dom4j.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>xmlsec.jar</value>
+ <value>jbossws.jar</value>
+ <value>jboss-bean-deployer.jar</value>
+ <value>jboss-microcontainer.jar</value>
+ <value>jboss-dependency.jar</value>
+ <value>jboss-container.jar</value>
+ <value>tomcat-coyote.jar</value>
+ <value>commons-collections.jar</value>
+ <value>myfaces.jar</value>
+ <value>jstl.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>myfaces-impl.jar</value>
+ <value>commons-beanutils.jar</value>
+ <value>myfaces-jsf-api.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>catalina-optional.jar</value>
+ <value>tomcat-util.jar</value>
+ <value>jasper-compiler.jar</value>
+ <value>commons-el.jar</value>
+ <value>jasper-compiler-jdt.jar</value>
+ <value>tomcat-http.jar</value>
+ <value>catalina-manager.jar</value>
+ <value>jasper-runtime.jar</value>
+ <value>tomcat55-service.jar</value>
+ <value>servlets-invoker.jar</value>
+ <value>catalina.jar</value>
+ <value>naming-resources.jar</value>
+ <value>servlets-default.jar</value>
+ <value>tomcat-ajp.jar</value>
+ <value>commons-modeler.jar</value>
+ <value>tomcat-apr.jar</value>
+ <value>servlets-webdav.jar</value>
+ </set>
+ </property>
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
+ <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
+
+ <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ <parameter>
+ <value>car</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ </uninstall>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ <!-- StatefulTreeCache -->
+ <entry>
+ <key>StatefulTreeCache</key>
+ <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- EJB3 Pool Factory Registry -->
+ <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- ThreadlocalPool -->
+ <entry>
+ <key>ThreadlocalPool</key>
+ <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
+ </entry>
+ <!-- StrictMaxPool -->
+ <entry>
+ <key>StrictMaxPool</key>
+ <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- EJB3 Persistence Manager Factory Registry -->
+ <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- StatefulSessionFilePersistenceManager -->
+ <entry>
+ <key>StatefulSessionFilePersistenceManager</key>
+ <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+
+ <!-- Persistence Unit deployers -->
+ <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ <parameter>
+ <value>par</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ </uninstall>
+ </bean>
+
+
+
+</deployment>
Deleted: trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- EJB3 Deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
-
- <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
- <!-- TODO: allow for configuration
- <property name="dependencies">
- <dependency xmlns="urn:jboss:dependency:1.0">
- <item>javax.transaction.TransactionManager</item>
- </dependency>
- </property>
- -->
- </bean>
-
- <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
- <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- <parameter>
- <value>3.*</value>
- </parameter>
- <parameter>
- <value>getEjbVersion</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- </uninstall>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
- <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
- <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
- <!-- Should war deployments be scanned for annotated ejbs -->
- <property name="scanWars">false</property>
-
- <!--
-
- Configure the deployer to optionally require a deployment
- descriptor for deployable units. By turning this switch to "true",
- "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
- will be required for deployment, enabling a performance increace in deployment by
- not scanning for annotations in non-deployable EJB3 JARs.
-
- Default for this value is "false".
-
- -->
- <property name="deploymentDescriptorRequired">false</property>
-
- <property name="ignoredJarsSet">
- <set elementClass="java.lang.String">
- <value>snmp-adaptor.jar</value>
- <value>otherimages.jar</value>
- <value>applet.jar</value>
- <value>jcommon.jar</value>
- <value>console-mgr-classes.jar</value>
- <value>jfreechart.jar</value>
- <value>juddi-service.jar</value>
- <value>wsdl4j.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-pool.jar</value>
- <value>juddi.jar</value>
- <value>commons-discovery.jar</value>
- <value>uddi4j.jar</value>
- <value>axis.jar</value>
- <value>commons-dbcp.jar</value>
- <value>jboss-juddiaxis.jar</value>
- <value>trove.jar</value>
- <value>javassist.jar</value>
- <value>jboss-aop-jdk50.jar</value>
- <value>jboss-aspect-library-jdk50.jar</value>
- <value>jpa-api.jar</value>
- <value>commons-validator-1.1.3.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-fileupload.jar</value>
- <value>commons-pool.jar</value>
- <value>hibernate-entitymanager.jar</value>
- <value>jboss-ejb3x.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>cglib-2.1.1.jar</value>
- <value>commons-discovery.jar</value>
- <value>jboss-annotations-ejb3.jar</value>
- <value>jaxen-1.1-beta-4.jar</value>
- <value>hibernate-annotations.jar</value>
- <value>commons-httpclient.jar</value>
- <value>commons-logging.jar</value>
- <value>commons-vfs.jar</value>
- <value>hibernate3.jar</value>
- <value>commons-logging-api.jar</value>
- <value>asm.jar</value>
- <value>asm-attrs.jar</value>
- <value>commons-lang-2.0.jar</value>
- <value>jboss-ejb3.jar</value>
- <value>dom4j.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>wsdl4j.jar</value>
- <value>xmlsec.jar</value>
- <value>jbossws.jar</value>
- <value>jboss-bean-deployer.jar</value>
- <value>jboss-microcontainer.jar</value>
- <value>jboss-dependency.jar</value>
- <value>jboss-container.jar</value>
- <value>tomcat-coyote.jar</value>
- <value>commons-collections.jar</value>
- <value>myfaces.jar</value>
- <value>jstl.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>myfaces-impl.jar</value>
- <value>commons-beanutils.jar</value>
- <value>myfaces-jsf-api.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>catalina-optional.jar</value>
- <value>tomcat-util.jar</value>
- <value>jasper-compiler.jar</value>
- <value>commons-el.jar</value>
- <value>jasper-compiler-jdt.jar</value>
- <value>tomcat-http.jar</value>
- <value>catalina-manager.jar</value>
- <value>jasper-runtime.jar</value>
- <value>tomcat55-service.jar</value>
- <value>servlets-invoker.jar</value>
- <value>catalina.jar</value>
- <value>naming-resources.jar</value>
- <value>servlets-default.jar</value>
- <value>tomcat-ajp.jar</value>
- <value>commons-modeler.jar</value>
- <value>tomcat-apr.jar</value>
- <value>servlets-webdav.jar</value>
- </set>
- </property>
- <depends>AspectLibrary</depends>
- </bean>
-
- <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- </bean>
-
- <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
- <depends>AppClientParsingDeployer</depends>
- </bean>
- <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
- <depends>AppClientParsingDeployer</depends>
- </bean>
-
- <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- <parameter>
- <value>car</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- </uninstall>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- </bean>
-
- <!-- EJB3 Cache Factory Registry -->
- <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- NoPassivationCache -->
- <entry>
- <key>NoPassivationCache</key>
- <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
- </entry>
- <!-- SimpleStatefulCache -->
- <entry>
- <key>SimpleStatefulCache</key>
- <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
- </entry>
- <!-- StatefulTreeCache -->
- <entry>
- <key>StatefulTreeCache</key>
- <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- EJB3 Pool Factory Registry -->
- <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- ThreadlocalPool -->
- <entry>
- <key>ThreadlocalPool</key>
- <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
- </entry>
- <!-- StrictMaxPool -->
- <entry>
- <key>StrictMaxPool</key>
- <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- EJB3 Persistence Manager Factory Registry -->
- <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- StatefulSessionFilePersistenceManager -->
- <entry>
- <key>StatefulSessionFilePersistenceManager</key>
- <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
-
- <!-- Persistence Unit deployers -->
- <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- <parameter>
- <value>par</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- </uninstall>
- </bean>
-
- <!--
-
- JNDI Registrars
-
-
- The JNDI Registrar is responsible for all JNDI Bindings for
- an EJB.
-
- -->
-
- <!-- SLSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatelessSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
-
- <!-- SFSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatefulSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
-
- <!-- @Service JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiServiceRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.service.ServiceProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
-
- <bean name="org.jboss.ejb3.ProxyClusteringRegistry"
- class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
-
- <!-- Clustered SLSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSLSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatelessSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.clustered.objectfactory.session.stateless.StatelessSessionClusteredProxyObjectFactory
- </parameter>
- <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
- </constructor>
- </bean>
-
- <!-- Clustered SFSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSFSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatefulSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.clustered.objectfactory.session.stateful.StatefulSessionClusteredProxyObjectFactory
- </parameter>
- <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
- </constructor>
- </bean>
-
- <!-- EJB3 ProcessorChain Deployer -->
- <bean name="Ejb3MetadataProcessingDeployer"
- class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
- <!-- EJB3 JNDI Policy Decorator Deployer -->
- <bean name="EjbMetadataJndiPolicyDecoratorDeployer"
- class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer" />
-
- <!-- EJB Reference Resolver -->
- <bean name="org.jboss.ejb3.EjbReferenceResolver" class="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver">
- <constructor factoryClass="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolverFactory"
- factoryMethod="newInstance">
- <parameter>org.jboss.ejb3.common.resolvers.plugins.FirstMatchEjbReferenceResolver</parameter>
- </constructor>
- </bean>
-
- <!-- Add Annotation Plugins upon installation -->
- <bean name="org.jboss.ejb3.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService"
- class="org.jboss.ejb3.mcint.annotationadaptor.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService">
- <constructor>
- <parameter><inject bean="jboss.kernel:service=Kernel"/></parameter>
- </constructor>
- </bean>
-
- <!-- EJB Reference Annotation Plugin -->
- <bean name="org.jboss.ejb3.EjbReferenceAnnotationPlugin"
- class="org.jboss.ejb3.mcint.metadata.plugins.EjbReferenceAnnotationPlugin">
- <constructor>
- <parameter><inject bean="org.jboss.ejb3.EjbReferenceResolver" /></parameter>
- </constructor>
- </bean>
-
-</deployment>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/server/pom.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -252,18 +252,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-deployers</artifactId>
- <version>1.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-deployment</artifactId>
</dependency>
Modified: trunk/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java 2010-01-15 18:22:47 UTC (rev 99498)
@@ -45,10 +45,16 @@
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBean31MetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedJNDINameResolverFactory;
+import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.EntityBeanJNDINameResolver;
+import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.SessionBean31JNDINameResolver;
+import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.SessionBeanJNDINameResolver;
+import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.DefaultJNDIBindingPolicyFactory;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
-import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.PackagingType;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
@@ -83,6 +89,12 @@
private static Logger log = Logger.getLogger(MappedReferenceMetaDataResolverDeployer.class);
/** */
private boolean failOnUnresolvedRefs;
+
+ /**
+ * Default jndi binding policy to be used for resolving
+ * jndi names for EJBs
+ */
+ private DefaultJndiBindingPolicy defaultJNDIBindingPolicy = DefaultJNDIBindingPolicyFactory.getDefaultJNDIBindingPolicy();
public MappedReferenceMetaDataResolverDeployer()
{
@@ -373,10 +385,12 @@
{
JBossSessionBeanMetaData sbean = (JBossSessionBeanMetaData) bean;
String ejbName = sbean.getEjbName();
+ SessionBeanJNDINameResolver sessionbeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver(sbean, this.defaultJNDIBindingPolicy);
// home
if(sbean.getHome() != null && sbean.getHome().length() > 0)
{
- cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.HOME));
+ String remoteHomeJNDIName = sessionbeanJNDINameResolver.resolveRemoteHomeJNDIName(sbean);
+ cdmd.addJndiName(remoteHomeJNDIName);
// Add ejb/vfsPath at iface
String home = sbean.getHome();
String ifacePath = prefix + "@" + home;
@@ -409,7 +423,7 @@
{
// Add ejb/vfsPath at iface
String remote = sbean.getRemote();
- String remoteJndiName = sbean.determineJndiName();
+ String remoteJndiName = sessionbeanJNDINameResolver.resolveJNDIName(sbean, remote);
cdmd.addJndiName(remoteJndiName);
String ifacePath = prefix + "@" + remote;
if(endpointAlternateMap.containsKey(ifacePath))
@@ -439,7 +453,8 @@
// local-home
if(sbean.getLocalHome() != null && sbean.getLocalHome().length() > 0)
{
- cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME));
+ String localHomeJNDIName = sessionbeanJNDINameResolver.resolveLocalHomeJNDIName(sbean);
+ cdmd.addJndiName(localHomeJNDIName);
// Add ejb/vfsPath at iface
String local = sbean.getLocalHome();
String ifacePath = prefix + "@" + local;
@@ -472,7 +487,7 @@
{
// Add ejb/vfsPath at iface
String local = sbean.getLocal();
- String localJndiName = sbean.determineLocalJndiName();
+ String localJndiName = sessionbeanJNDINameResolver.resolveJNDIName(sbean, local);
cdmd.addJndiName(localJndiName);
String ifacePath = prefix + "@" + local;
if(endpointAlternateMap.containsKey(ifacePath))
@@ -503,13 +518,13 @@
BusinessLocalsMetaData locals = sbean.getBusinessLocals();
if(locals != null && locals.size() > 0)
{
- String localBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.LOCAL);
- cdmd.addJndiName(localBaseJndiName);
+ String defaultLocalBusinessJNDIName = sessionbeanJNDINameResolver.resolveLocalBusinessDefaultJNDIName(sbean);
+ cdmd.addJndiName(defaultLocalBusinessJNDIName);
for(String local : locals)
{
// Add a targeted jndi name
- String localJndiName = sbean.determineResolvedJndiName(local);
- cdmd.addJndiName(localJndiName);
+ String localBusinessJNDIName = sessionbeanJNDINameResolver.resolveJNDIName(sbean, local);
+ cdmd.addJndiName(localBusinessJNDIName);
// Add ejb/vfsPath at iface
String ifacePath = prefix + "@" + local;
if(endpointAlternateMap.containsKey(ifacePath))
@@ -540,13 +555,13 @@
BusinessRemotesMetaData remotes = sbean.getBusinessRemotes();
if(remotes != null && remotes.size() > 0)
{
- String remoteBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.REMOTE);
- cdmd.addJndiName(remoteBaseJndiName);
+ String defaultRemoteBusinessJNDIName = sessionbeanJNDINameResolver.resolveRemoteBusinessDefaultJNDIName(sbean);
+ cdmd.addJndiName(defaultRemoteBusinessJNDIName);
for(String remote : remotes)
{
// Add a targeted jndi name
- String remoteJndiName = sbean.determineResolvedJndiName(remote);
- cdmd.addJndiName(remoteJndiName);
+ String remoteBusinessJNDIName = sessionbeanJNDINameResolver.resolveJNDIName(sbean, remote);
+ cdmd.addJndiName(remoteBusinessJNDIName);
// Add ejb/vfsPath/iface
String ifacePath = prefix + "@" + remote;
if(endpointAlternateMap.containsKey(ifacePath))
@@ -571,17 +586,68 @@
}
}
}
+ // Map no-interface view of EJB3.1 bean
+ if (sbean instanceof JBossSessionBean31MetaData)
+ {
+ JBossSessionBean31MetaData sessionBean31 = (JBossSessionBean31MetaData) sbean;
+ if (sessionBean31.isNoInterfaceBean())
+ {
+ SessionBean31JNDINameResolver sessionBean31JNDINameResolver = (SessionBean31JNDINameResolver) sessionbeanJNDINameResolver;
+ String noInterfaceJNDIName = sessionBean31JNDINameResolver.resolveNoInterfaceJNDIName(sessionBean31);
+ // add it to container metadata
+ cdmd.addJndiName(noInterfaceJNDIName);
+ // TODO: The rest of the stuff is way too ugly, but that's what is being
+ // done for maintaining per business interface endpoint mappings. So let's
+ // for the time being, do the same for no-interface view endpoint mappings.
+
+ String ejbClassName = sessionBean31.getEjbClass();
+ // add to end point mappings
+ String ifacePath = prefix + "@" + ejbClassName;
+ if(endpointAlternateMap.containsKey(ifacePath))
+ {
+ log.debug(ejbName + " duplicates nointerface bean: " + ejbClassName
+ + ", existing: " + endpointAlternateMap.get(ifacePath));
+ }
+ else
+ {
+ endpointAlternateMap.put(ifacePath, ejbCompID);
+ mappings.add(ifacePath);
+ if(trace)
+ {
+ log.trace("mapEjbs, nointerface bean: " + ifacePath + ", ejbName: " + ejbName);
+ }
+ }
+ // Add ejb/iface
+ ifacePath = "ejb@" + ejbClassName;
+ if(endpointMap.containsKey(ifacePath))
+ {
+ // TODO: may need to track the duplicates to create an error
+ log.debug(ejbName + " duplicates nointerface bean : " + ejbClassName + ", existing: "
+ + endpointMap.get(ifacePath));
+ }
+ else
+ {
+ endpointAlternateMap.put(ifacePath, ejbCompID);
+ mappings.add(ifacePath);
+ if(trace)
+ log.trace("mapEjbs, nointerface bean : " + ifacePath + ", ejbName: " + ejbName);
+ }
+
+ }
+ }
if(trace)
log.trace("mapEjbs: "+ejbCompID+", mappings: "+mappings);
}
else if(bean instanceof JBossEntityBeanMetaData)
{
JBossEntityBeanMetaData ebean = (JBossEntityBeanMetaData) bean;
+ EntityBeanJNDINameResolver entityBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver(ebean, this.defaultJNDIBindingPolicy);
String ejbName = ebean.getEjbName();
// home
if(ebean.getHome() != null && ebean.getHome().length() > 0)
{
- cdmd.addJndiName(ebean.determineResolvedJndiName(KnownInterfaces.HOME));
+ String homeJNDIName = entityBeanJNDINameResolver.resolveRemoteHomeJNDIName(ebean);
+ cdmd.addJndiName(homeJNDIName);
// Add ejb/vfsPath at iface
String home = ebean.getHome();
String ifacePath = prefix + "@" + home;
@@ -642,7 +708,8 @@
// local-home
if(ebean.getLocalHome() != null && ebean.getLocalHome().length() > 0)
{
- cdmd.addJndiName(ebean.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME));
+ String localHomeJNDIName = entityBeanJNDINameResolver.resolveLocalHomeJNDIName(ebean);
+ cdmd.addJndiName(localHomeJNDIName);
// Add ejb/vfsPath at iface
String local = ebean.getLocalHome();
String ifacePath = prefix + "@" + local;
@@ -799,7 +866,18 @@
String ifaceName = iface != null ? iface.getName() : null;
//LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
- String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName);
+ JBossEnterpriseBeanMetaData beanMD = target.getBeanMetaData();
+ String containerJndiName = null;
+ if (beanMD.isSession() || beanMD.isService())
+ {
+ SessionBeanJNDINameResolver jndiNameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossSessionBeanMetaData) beanMD, this.defaultJNDIBindingPolicy);
+ containerJndiName = jndiNameResolver.resolveJNDIName((JBossSessionBeanMetaData) beanMD, ifaceName);
+ }
+ else if (beanMD.isEntity())
+ {
+ EntityBeanJNDINameResolver jndiNameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossEntityBeanMetaData) beanMD, this.defaultJNDIBindingPolicy);
+ containerJndiName = jndiNameResolver.resolveJNDIName((JBossEntityBeanMetaData) beanMD, ifaceName);
+ }
if(containerJndiName != null)
ref.setResolvedJndiName(containerJndiName);
}
@@ -915,9 +993,27 @@
// Resolve a local JNDI Name based on Spec type
String localJndiName = null;
- if (ejbJarMd.isEJB3x() && !useDefaultProxy)
+ if (ejbJarMd.isEJB3x())
{
- localJndiName = md.determineResolvedJndiName(localInterface);
+ if (md.isSession() || md.isService())
+ {
+ SessionBeanJNDINameResolver sessionBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossSessionBeanMetaData) md, this.defaultJNDIBindingPolicy);
+ if (useDefaultProxy)
+ {
+ localJndiName = sessionBeanJNDINameResolver
+ .resolveLocalBusinessDefaultJNDIName((JBossSessionBeanMetaData) md);
+ }
+ else
+ {
+ localJndiName = sessionBeanJNDINameResolver.resolveJNDIName((JBossSessionBeanMetaData) md, localInterface);
+ }
+
+ }
+ else if (md.isEntity())
+ {
+ EntityBeanJNDINameResolver entityBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossEntityBeanMetaData) md, this.defaultJNDIBindingPolicy);
+ localJndiName = entityBeanJNDINameResolver.resolveJNDIName((JBossEntityBeanMetaData) md, localInterface);
+ }
}
else
{
@@ -1048,21 +1144,39 @@
JBossMetaData ejbMarMd = md.getEnterpriseBeansMetaData().getEjbJarMetaData();
// Resolve a JNDI name
- String containerJndiName = null;
- if (ejbMarMd.isEJB3x() && !useDefaultProxy)
+ String remoteJNDIName = null;
+ if (ejbMarMd.isEJB3x())
{
- containerJndiName = md.determineResolvedJndiName(remoteInterface);
+ if (md.isSession() || md.isService())
+ {
+ SessionBeanJNDINameResolver sessionBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossSessionBeanMetaData) md, this.defaultJNDIBindingPolicy);
+ if (useDefaultProxy)
+ {
+ remoteJNDIName = sessionBeanJNDINameResolver.resolveRemoteBusinessDefaultJNDIName((JBossSessionBeanMetaData) md);
+ }
+ else
+ {
+ remoteJNDIName = sessionBeanJNDINameResolver.resolveJNDIName((JBossSessionBeanMetaData) md, remoteInterface);
+ }
+
+ }
+ else if (md.isEntity())
+ {
+ EntityBeanJNDINameResolver entityBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver((JBossEntityBeanMetaData) md, this.defaultJNDIBindingPolicy);
+ remoteJNDIName = entityBeanJNDINameResolver.resolveJNDIName((JBossEntityBeanMetaData) md, remoteInterface);
+ }
+
}
else
{
- containerJndiName = md.determineJndiName();
+ remoteJNDIName = md.determineJndiName();
}
// If we've got a resolved name
- if(containerJndiName != null)
+ if(remoteJNDIName != null)
{
// Set it
- ref.setResolvedJndiName(containerJndiName);
+ ref.setResolvedJndiName(remoteJNDIName);
}
// Add the dependency
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-01-15 18:17:16 UTC (rev 99497)
+++ trunk/webservices/pom.xml 2010-01-15 18:22:47 UTC (rev 99498)
@@ -128,7 +128,6 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3_1</artifactId>
- <type>pom</type>
<exclusions>
<exclusion>
<groupId>org.jboss.cache</groupId>
More information about the jboss-cvs-commits
mailing list