[jboss-cvs] JBossAS SVN: r70202 - in trunk: embedded and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 28 02:28:38 EST 2008
Author: scott.stark at jboss.org
Date: 2008-02-28 02:28:37 -0500 (Thu, 28 Feb 2008)
New Revision: 70202
Modified:
trunk/ejb3/.classpath
trunk/ejb3/build.xml
trunk/embedded/.classpath
trunk/embedded/build.xml
trunk/spring-int/build.xml
trunk/testsuite/.classpath
trunk/testsuite/build.xml
trunk/tomcat/.classpath
trunk/tomcat/build.xml
trunk/webservices/.classpath
trunk/webservices/build.xml
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
Log:
Remove usage of ejb3 project artifacts and use the external ejb3 project artifacts
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/ejb3/.classpath 2008-02-28 07:28:37 UTC (rev 70202)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry excluding="org/jboss/ejb3/test/**/*EmbeddedTest.java|org/jboss/ejb3/test/clusteredentity/unit/|org/jboss/ejb3/test/clusteredservice/unit/|org/jboss/ejb3/test/clusteredsession/unit/|org/jboss/ejb3/test/ejbthree921/unit/" kind="src" path="src/test"/>
+ <classpathentry including="org/jboss/ejb3/deployers/**" kind="src" path="src/main"/>
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
@@ -73,5 +72,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api-impl/lib/jboss-ejb3-ext-api-impl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/ejb3/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -294,98 +294,18 @@
<mkdir dir="${build.lib}"/>
- <!-- jboss-ejb3.jar -->
- <jar jarfile="${build.lib}/jboss-ejb3.jar" manifest="${build.etc}/default.mf">
+ <!-- jboss-ejb3-deployer.jar -->
+ <jar jarfile="${build.lib}/jboss-ejb3-deployer.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/**"/>
- <!-- fix cyclic dependency with webservice module -->
- <include name="javax/jws/*.class"/>
- <include name="javax/xml/ws/*.class"/>
- <exclude name="org/jboss/ejb3/test/**"/>
- <exclude name="org/jboss/annotation/**"/>
+ <include name="org/jboss/ejb3/deployers/**"/>
</fileset>
</jar>
- <!-- build hibernate-client.jar -->
- <!-- <unjar src="${hibernate.hibernate.lib}/hibernate3.jar"
- dest="${build.classes}" /> -->
- <jar jarfile="${build.lib}/hibernate-client.jar">
- <zipfileset src="${hibernate.hibernate.lib}/hibernate3.jar">
- <include name="org/hibernate/AssertionFailure.class"/>
- <include name="org/hibernate/**/*Exception.class"/>
- <include name="org/hibernate/collection/**"/>
- <include name="org/hibernate/exception/Nestable*.class"/>
- <include name="org/hibernate/exception/ExceptionUtils.class"/>
- <include name="org/hibernate/engine/SessionImplementor.class"/>
- <include name="org/hibernate/loader/CollectionAliases.class"/>
- <include name="org/hibernate/persister/collection/**"/>
- <include name="org/hibernate/pretty/MessageHelper.class"/>
- <include name="org/hibernate/type/Type.class"/>
- <include name="org/hibernate/EntityMode.class"/>
- <include name="org/hibernate/util/**"/>
- <include name="org/hibernate/proxy/**"/>
- </zipfileset>
- </jar>
-
- <!-- build client-jar -->
- <jar jarfile="${build.lib}/jboss-ejb3-client.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/EJB3Util.class"/>
- <include name="org/jboss/ejb3/JndiUtil.class"/>
- <include name="org/jboss/ejb3/Ejb3Registry.class"/>
- <include name="org/jboss/ejb3/InitialContextFactory.class"/>
- <include name="org/jboss/ejb3/asynchronous/*"/>
- <include name="org/jboss/ejb3/interceptor/ClientInterceptorUtil.class"/>
- <include name="org/jboss/ejb3/mdb/ConsumerManager.class"/>
- <include name="org/jboss/ejb3/mdb/Producer*.class"/>
- <include name="org/jboss/ejb3/remoting/ClusteredIsLocalInterceptor.*"/>
- <include name="org/jboss/ejb3/remoting/IsLocalInterceptor.*"/>
- <include name="org/jboss/ejb3/remoting/IsLocalProxyFactoryInterceptor.*"/>
- <include name="org/jboss/ejb3/stateful/ForwardId.class"/>
- <include name="org/jboss/ejb3/stateful/StatefulRemoteInvocation.class"/>
- <include name="org/jboss/ejb3/ProxyUtils.class"/>
- <include name="org/jboss/ejb3/**/*Proxy.class"/>
- <include name="org/jboss/ejb3/**/*HandleImpl.class"/>
- <include name="org/jboss/ejb3/*Container.class"/>
- <include name="org/jboss/ejb3/session/SessionContainer.class"/>
- <include name="org/jboss/ejb3/**/*ProxyFactory.class"/>
- <include name="org/jboss/ejb3/proxy/**/*.class"/>
- <include name="org/jboss/ejb3/*ServiceServer*.class"/>
- <include name="org/jboss/ejb3/*KernelAbstraction*.class"/>
- <include name="org/jboss/ejb3/statistics/*.class"/>
- <include name="org/jboss/ejb3/javaee/*.class"/>
-
- <!-- EJBTHREE-485: include java assist proxy stuff -->
- <include name="org/jboss/ejb3/stateless/Javassist*.class"/>
-
- <!-- EJBTHREE-667: include object factory -->
- <include name="org/jboss/ejb3/naming/client/**/*.class"/>
- <include name="org/jboss/ejb3/naming/BrainlessContext.class"/>
-
- <!-- EJBTHREE-718: client container -->
- <include name="org/jboss/ejb3/client/**/*.class"/>
- <include name="org/jboss/ejb3/metamodel/**/*.class"/>
- <include name="org/jboss/injection/**/*.class"/>
- <include name="org/jboss/ejb3/ThreadLocalENCFactory.class"/>
- </fileset>
- </jar>
-
-
- <!-- jboss-annotations-ejb3.jar -->
- <jar jarfile="${build.lib}/jboss-annotations-ejb3.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/annotation/**"/>
- </fileset>
- </jar>
-
<mkdir dir="${build.lib}/ejb3.deployer"/>
<copy todir="${build.lib}/ejb3.deployer">
<fileset dir="${build.lib}">
- <include name="jboss-ejb3.jar"/>
+ <include name="jboss-ejb3-deployer.jar"/>
</fileset>
- <fileset dir="${build.lib}">
- <include name="jboss-annotations-ejb3.jar"/>
- </fileset>
<fileset dir="${resources}">
<include name="META-INF/ejb3-deployers-beans.xml"/>
<include name="META-INF/persistence.properties"/>
Modified: trunk/embedded/.classpath
===================================================================
--- trunk/embedded/.classpath 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/embedded/.classpath 2008-02-28 07:28:37 UTC (rev 70202)
@@ -50,5 +50,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-collections/lib/commons-collections.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/embedded/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -100,7 +100,8 @@
<!-- FIXME: temporary for EJBTHREE-485 -->
<path refid="cglib.classpath"/>
<path refid="jboss.integration.classpath"/>
- <path refid="jboss.jboss.ejb3.cache.classpath"/>
+ <path refid="jboss.jboss.ejb3.core.classpath"/>
+ <path refid="jboss.jboss.ejb3.cache.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
</path>
@@ -135,7 +136,6 @@
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.test.classpath"/>
- <path refid="jboss.ejb3.classpath"/>
<path refid="jboss.bootstrap.classpath"/>
</path>
Modified: trunk/spring-int/build.xml
===================================================================
--- trunk/spring-int/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/spring-int/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -349,7 +349,6 @@
<path id="example.classpath">
<path refid="jboss.aop.classpath"/>
<path refid="jboss.common.classpath"/>
- <path refid="jboss.ejb3.classpath"/>
<path refid="jboss.ejb3x.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.j2ee.classpath"/>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/testsuite/.classpath 2008-02-28 07:28:37 UTC (rev 70202)
@@ -102,5 +102,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/testsuite/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -127,6 +127,7 @@
<path refid="jboss.jaxr.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.serialization.classpath"/>
+ <path refid="jboss.jboss.ejb3.core.classpath" />
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
<path refid="jboss.jbossws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
@@ -183,7 +184,6 @@
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.deployment.classpath"/>
- <path refid="jboss.ejb3.classpath"/>
<path refid="jboss.hibernate.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/tomcat/.classpath 2008-02-28 07:28:37 UTC (rev 70202)
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-impl.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ejb3"/>
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/el-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jasper-jdt.jar"/>
@@ -66,5 +65,6 @@
<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-classloader.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-classloader-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/tomcat/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -69,6 +69,7 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.integration.classpath"/>
+ <path refid="jboss.jboss.ejb3.core.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
</path>
@@ -93,7 +94,6 @@
<path refid="jboss.cache.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.ejb3.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.test.classpath" />
<path refid="jboss.iiop.classpath"/>
Modified: trunk/webservices/.classpath
===================================================================
--- trunk/webservices/.classpath 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/webservices/.classpath 2008-02-28 07:28:37 UTC (rev 70202)
@@ -41,5 +41,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/aspects"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/webservices/build.xml 2008-02-28 07:28:37 UTC (rev 70202)
@@ -72,6 +72,7 @@
<path refid="jboss.aop.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.jboss.ejb3.core.classpath" />
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
<path refid="jboss.jboss.javaee.classpath"/>
@@ -94,12 +95,12 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
+ <path refid="jboss.aspects.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.ejb3.classpath"/>
<path refid="jboss.tomcat.classpath"/>
</path>
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2008-02-28 07:28:21 UTC (rev 70201)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2008-02-28 07:28:37 UTC (rev 70202)
@@ -30,12 +30,8 @@
import javax.xml.ws.WebServiceException;
import org.jboss.aop.Dispatcher;
-import org.jboss.aop.MethodInfo;
-import org.jboss.aop.util.MethodHashing;
import org.jboss.ejb3.BeanContext;
import org.jboss.ejb3.BeanContextLifecycleCallback;
-import org.jboss.ejb3.EJBContainerInvocation;
-import org.jboss.ejb3.session.ClassProxyHack;
import org.jboss.ejb3.stateless.StatelessBeanContext;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.injection.lang.reflect.BeanProperty;
@@ -98,8 +94,6 @@
// Workaround for [EJBTHREE-1192] ClassProxyHack breaks all EJB3 Web Service endpoints
if (regobj instanceof StatelessContainer)
container = (StatelessContainer)regobj;
- else if (regobj instanceof ClassProxyHack)
- container = (StatelessContainer)((ClassProxyHack)regobj).getContainer();
else
throw new IllegalStateException("Unsupported obj instance: " + regobj);
@@ -107,16 +101,10 @@
Method method = getImplMethod(beanClass, wsInv.getJavaMethod());
Object[] args = wsInv.getArgs();
+ CallbackImpl callback = new CallbackImpl(wsInv);
- long hash = MethodHashing.calculateHash(method);
- MethodInfo info = container.getAdvisor().getMethodInfo(hash);
- EJBContainerInvocation<StatelessContainer, StatelessBeanContext> jbInv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info);
- jbInv.setAdvisor(container.getAdvisor());
- jbInv.setArguments(args);
- jbInv.setContextCallback(new CallbackImpl(wsInv));
+ Object retObj = container.localInvoke(method, args, null, callback);
- Object retObj = jbInv.invokeNext();
-
wsInv.setReturnValue(retObj);
}
catch (Throwable th)
More information about the jboss-cvs-commits
mailing list