[jboss-cvs] JBossAS SVN: r84681 - in branches/Branch_5_x: aspects/src/test50 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 24 17:22:28 EST 2009
Author: ALRubinger
Date: 2009-02-24 17:22:28 -0500 (Tue, 24 Feb 2009)
New Revision: 84681
Removed:
branches/Branch_5_x/aspects/src/test50/org/
branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/iiop/
Modified:
branches/Branch_5_x/aspects/build-test50.xml
branches/Branch_5_x/aspects/build.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
Log:
[JBAS-6430] AS Branch_5_x component upgrade to EJB3 1.1.1
Modified: branches/Branch_5_x/aspects/build-test50.xml
===================================================================
--- branches/Branch_5_x/aspects/build-test50.xml 2009-02-24 21:51:50 UTC (rev 84680)
+++ branches/Branch_5_x/aspects/build-test50.xml 2009-02-24 22:22:28 UTC (rev 84681)
@@ -220,24 +220,6 @@
<!-- Archives -->
<!-- ================================================================== -->
- <target name="asynch"
- description="Builds all jar files."
- depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/asynch-test.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/asynch/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/asynch">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
-
- </target>
-
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
<mkdir dir="${build.reports}"/>
@@ -285,7 +267,7 @@
</junit>
</target>
- <target name="jars" depends="asynch"/>
+ <target name="jars" />
<target name="tests" depends="init" description="Execute all tests">
<antcall target="test" inheritRefs="true">
Modified: branches/Branch_5_x/aspects/build.xml
===================================================================
--- branches/Branch_5_x/aspects/build.xml 2009-02-24 21:51:50 UTC (rev 84680)
+++ branches/Branch_5_x/aspects/build.xml 2009-02-24 22:22:28 UTC (rev 84681)
@@ -232,10 +232,6 @@
<fileset dir="${build.etc}">
<include name="org/jboss/**/*.xml"/>
</fileset>
- <!-- include the broken out asynch aspects in the lib -->
- <zipfileset src="${org.jboss.ejb3.lib}/jboss-ejb3-async.jar">
- <include name="org/jboss/aspects/asynch/**.class"/>
- </zipfileset>
<!-- include the current invocation aspects in the lib -->
<zipfileset src="${org.jboss.aspects.lib}/jboss-current-invocation-aspects.jar">
<include name="org/jboss/aspects/currentinvocation/**.class"/>
@@ -279,10 +275,6 @@
<!-- Build client jar containing the minimum needed for ejb3 -->
<jar destfile="${build.lib}/jboss-aspect-jdk50-client.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
- <!-- include the broken out asynch aspects in the client lib -->
- <zipfileset src="${org.jboss.ejb3.lib}/jboss-ejb3-async.jar">
- <include name="org/jboss/aspects/asynch/**.class"/>
- </zipfileset>
<!-- include the broken out remoting aspects in the client lib -->
<zipfileset src="${org.jboss.aspects.lib}/jboss-remoting-aspects.jar">
<include name="org/jboss/aspects/remoting/InvokeRemoteInterceptor.class"/>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-02-24 21:51:50 UTC (rev 84680)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-02-24 22:22:28 UTC (rev 84681)
@@ -52,9 +52,9 @@
<version.org.jboss.aspects.security>1.0.0.GA</version.org.jboss.aspects.security>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
<version.org.jboss.common.core>2.2.10.GA</version.org.jboss.common.core>
- <version.org.jboss.ejb3>1.1.0</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3>1.1.1</version.org.jboss.ejb3>
<version.org.jboss.ejb3.common.client>1.0.0</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.core.client>1.1.0</version.org.jboss.ejb3.core.client>
+ <version.org.jboss.ejb3.core.client>1.1.1</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.proxy.client>1.0.0</version.org.jboss.ejb3.proxy.client>
<version.org.jboss.ejb3.proxy.clustered.client>1.0.0</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
Modified: branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-02-24 21:51:50 UTC (rev 84680)
+++ branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-02-24 22:22:28 UTC (rev 84681)
@@ -44,7 +44,6 @@
<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="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
<property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
<!-- Should war deployments be scanned for annotated ejbs -->
<property name="scanWars">false</property>
@@ -224,51 +223,6 @@
</property>
</bean>
- <!-- Remoting Proxy Factory Registry -->
- <bean name="EJB3RemoteProxyFactoryRegistry" class="org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- RemoteProxyFactory -->
- <entry>
- <key>RemoteProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.RemoteProxyFactory</value>
- </entry>
- <!-- IORFactory -->
- <entry>
- <key>IORFactory</key>
- <value>org.jboss.ejb3.iiop.IORFactory</value>
- </entry>
- <!-- ServiceRemoteProxyFactory -->
- <entry>
- <key>ServiceRemoteProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.session.service.ServiceRemoteProxyFactory</value>
- </entry>
- <!-- StatefulClusterProxyFactory -->
- <entry>
- <key>StatefulClusterProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.stateful.StatefulClusterProxyFactory</value>
- </entry>
- <!-- StatefulRemoteProxyFactory -->
- <entry>
- <key>StatefulRemoteProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.stateful.StatefulRemoteProxyFactory</value>
- </entry>
- <!-- StatelessClusterProxyFactory -->
- <entry>
- <key>StatelessClusterProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.stateless.StatelessClusterProxyFactory</value>
- </entry>
- <!-- StatelessRemoteProxyFactory -->
- <entry>
- <key>StatelessRemoteProxyFactory</key>
- <value>org.jboss.ejb3.proxy.factory.stateless.StatelessRemoteProxyFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
<!-- EJB3 Persistence Manager Factory Registry -->
<bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
<property name="factories">
@@ -331,8 +285,8 @@
org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
</parameter>
</constructor>
- </bean>
-
+ </bean>
+
<!-- @Service JNDI Registrar -->
<bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
class="org.jboss.ejb3.proxy.jndiregistrar.JndiServiceRegistrar">
@@ -342,7 +296,6 @@
</parameter>
</constructor>
</bean>
-
<bean name="org.jboss.ejb3.ProxyClusteringRegistry"
class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
@@ -369,34 +322,35 @@
</constructor>
</bean>
-
<!-- EJB3 ProcessorChain Deployer -->
- <bean name="Ejb3MetadataProcessingDeployer" class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
+ <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 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>
-
- <!-- 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>
More information about the jboss-cvs-commits
mailing list