[jboss-cvs] JBossAS SVN: r85767 - in projects/ejb3/trunk: plugin and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 12 01:53:45 EDT 2009
Author: ALRubinger
Date: 2009-03-12 01:53:45 -0400 (Thu, 12 Mar 2009)
New Revision: 85767
Modified:
projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt
projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt
projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt
projects/ejb3/trunk/plugin/pom.xml
projects/ejb3/trunk/plugin/src/main/resources/installer.xml
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/pom.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/cache/Tester.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpSessionProxyInvocationHandler.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpStatefulRemoteProxyFactory.java
Log:
[EJBTHREE-1767] ejb3-installer, ejb3-plugin, and TestSuite updated to work with new ejb3-proxy-impl and ejb3-proxy-spi
Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-client.txt 2009-03-12 05:53:45 UTC (rev 85767)
@@ -1,7 +1,8 @@
jboss-ejb3-ext-api.jar
jboss-ejb3-common-client.jar
jboss-ejb3-core-client.jar
-jboss-ejb3-proxy-client.jar
+jboss-ejb3-proxy-spi-client.jar
+jboss-ejb3-proxy-impl-client.jar
jboss-ejb3-proxy-clustered-client.jar
jboss-ejb3-security-client.jar
jboss-metadata.jar
\ No newline at end of file
Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt 2009-03-12 05:53:45 UTC (rev 85767)
@@ -7,7 +7,8 @@
jboss-ejb3-interceptors.jar
jboss-ejb3-metadata.jar
jboss-ejb3-mc-int.jar
-jboss-ejb3-proxy.jar
+jboss-ejb3-proxy-impl.jar
+jboss-ejb3-proxy-spi.jar
jboss-ejb3-proxy-clustered.jar
jboss-ejb3-security.jar
jboss-ejb3-transactions.jar
Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-remove.txt 2009-03-12 05:53:45 UTC (rev 85767)
@@ -3,6 +3,7 @@
client/jboss-ejb3-proxy-client.jar
client/jboss-ejb3-proxy-clustered-client.jar
client/jboss-ejb3-security-client.jar
+common/lib/jboss-ejb3-proxy.jar
server/default/deployers/ejb3.deployer/META-INF/ejb3-deployers-beans.xml
server/default/deployers/ejb3.deployer/META-INF/persistence.properties
server/default/deployers/ejb3.deployer/META-INF/
Modified: projects/ejb3/trunk/plugin/pom.xml
===================================================================
--- projects/ejb3/trunk/plugin/pom.xml 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/plugin/pom.xml 2009-03-12 05:53:45 UTC (rev 85767)
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-installer</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
Modified: projects/ejb3/trunk/plugin/src/main/resources/installer.xml
===================================================================
--- projects/ejb3/trunk/plugin/src/main/resources/installer.xml 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/plugin/src/main/resources/installer.xml 2009-03-12 05:53:45 UTC (rev 85767)
@@ -43,7 +43,8 @@
<include>org.jboss.ejb3:jboss-ejb3-metadata:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-mc-int:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-pool:jar</include>
- <include>org.jboss.ejb3:jboss-ejb3-proxy:jar</include>
+ <include>org.jboss.ejb3:jboss-ejb3-proxy-impl:jar</include>
+ <include>org.jboss.ejb3:jboss-ejb3-proxy-spi:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-security:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-timerservice-as5:jar</include>
@@ -57,7 +58,8 @@
<includes>
<include>org.jboss.ejb3:jboss-ejb3-common:jar:client</include>
<include>org.jboss.ejb3:jboss-ejb3-core:jar:client</include>
- <include>org.jboss.ejb3:jboss-ejb3-proxy:jar:client</include>
+ <include>org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client</include>
+ <include>org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client</include>
<include>org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client</include>
<include>org.jboss.ejb3:jboss-ejb3-security:jar:client</include>
</includes>
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2009-03-12 05:53:45 UTC (rev 85767)
@@ -4356,7 +4356,11 @@
<isset property="test.extension"/>
</not>
</condition>
-
+
+ <!-- Use this for debugging classpath
+ <property name="myclasspath" refid="test.classpath"/>
+ <echo message="${myclasspath}" /> -->
+
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
@@ -4389,7 +4393,7 @@
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=/dt_socket,address=8787,server=y,suspend=y"/>
-->
-
+
<classpath>
<pathelement path="${location.target}/jboss-ejb3-testsuite.jar"/>
Modified: projects/ejb3/trunk/testsuite/pom.xml
===================================================================
--- projects/ejb3/trunk/testsuite/pom.xml 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/pom.xml 2009-03-12 05:53:45 UTC (rev 85767)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
<properties>
<!-- Version of JBoss AS Facilities we depend upon -->
- <version.org.jboss.jboss-as>5.0.0.CR2</version.org.jboss.jboss-as>
+ <version.org.jboss.jboss-as>5.0.1.GA</version.org.jboss.jboss-as>
</properties>
<build>
@@ -212,22 +212,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-async</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
+ <version>1.0.0-Beta-2</version>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <version>1.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/bank/TellerRemoteProxyFactory.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -21,9 +21,10 @@
*/
package org.jboss.ejb3.test.bank;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.session.SessionSpecContainer;
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.proxy.impl.factory.session.stateless.StatelessSessionRemoteProxyFactory;
import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
/**
* Comment
@@ -31,12 +32,14 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
*/
-public class TellerRemoteProxyFactory extends org.jboss.ejb3.proxy.factory.stateless.StatelessRemoteProxyFactory
+public class TellerRemoteProxyFactory extends StatelessSessionRemoteProxyFactory
{
private static final Logger log = Logger.getLogger(TellerRemoteProxyFactory.class);
-
- public TellerRemoteProxyFactory(SessionSpecContainer container, RemoteBinding binding)
+
+ public TellerRemoteProxyFactory(final String name, final String containerName, final String containerGuid,
+ final JBossSessionBeanMetaData metadata, final ClassLoader classloader, final String url,
+ final Advisor advisor, final String interceptorStackName)
{
- super(container, binding);
+ super(name, containerName, containerGuid, metadata, classloader, url, advisor, interceptorStackName);
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/cache/Tester.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/cache/Tester.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/cache/Tester.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -26,13 +26,13 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
import org.jboss.cache.loader.FileCacheLoader;
import org.jboss.mx.util.MBeanProxy;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
/**
* Comment
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -30,10 +30,10 @@
import javax.ejb.Remove;
import javax.interceptor.Interceptors;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.ejb3.test.clusteredsession.util.ExplicitFailoverInterceptor;
import org.jboss.ejb3.test.stateful.nested.base.VMTracker;
import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
/**
* Base class for various configs of a SFSB. No class-level clustering
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -24,10 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
/**
* @version <tt>$Revision$</tt>
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulRemoteProxyFactory.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -21,9 +21,10 @@
*/
package org.jboss.ejb3.test.stateful;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.session.SessionSpecContainer;
+import org.jboss.aop.Advisor;
+import org.jboss.ejb3.proxy.impl.factory.session.stateful.StatefulSessionRemoteProxyFactory;
import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
/**
* Comment
@@ -31,13 +32,15 @@
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version $Revision$
*/
-public class StatefulRemoteProxyFactory extends org.jboss.ejb3.proxy.factory.stateful.StatefulRemoteProxyFactory
+public class StatefulRemoteProxyFactory extends StatefulSessionRemoteProxyFactory
{
@SuppressWarnings("unused")
private static final Logger log = Logger.getLogger(StatefulRemoteProxyFactory.class);
-
- public StatefulRemoteProxyFactory(SessionSpecContainer container, RemoteBinding binding)
+
+ public StatefulRemoteProxyFactory(final String name, final String containerName, final String containerGuid,
+ final JBossSessionBeanMetaData metadata, final ClassLoader classloader, final String url,
+ final Advisor advisor, final String interceptorStackName)
{
- super(container, binding);
+ super(name, containerName, containerGuid, metadata, classloader, url, advisor, interceptorStackName);
}
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpSessionProxyInvocationHandler.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpSessionProxyInvocationHandler.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpSessionProxyInvocationHandler.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -23,7 +23,8 @@
import java.lang.reflect.Method;
-import org.jboss.ejb3.proxy.handler.session.SessionProxyInvocationHandler;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.ejb3.proxy.impl.handler.session.SessionProxyInvocationHandler;
/**
* NoOpSessionProxyInvocationHandler
@@ -43,4 +44,54 @@
throw new NoOpException("Invoked upon " + NoOpSessionProxyInvocationHandler.class.getName());
}
+ public String getBusinessInterfaceType()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContainerGuid()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContainerName()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Interceptor[] getInterceptors()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object getTarget()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setBusinessInterfaceType(String businessInterfaceType)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setContainerGuid(String containerGuid)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setContainerName(String containerName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setInterceptors(Interceptor[] interceptors)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setTarget(Object target)
+ {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpStatefulRemoteProxyFactory.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpStatefulRemoteProxyFactory.java 2009-03-12 05:53:23 UTC (rev 85766)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/statefulproxyfactoryoverride/NoOpStatefulRemoteProxyFactory.java 2009-03-12 05:53:45 UTC (rev 85767)
@@ -22,8 +22,8 @@
package org.jboss.ejb3.test.statefulproxyfactoryoverride;
import org.jboss.aop.Advisor;
-import org.jboss.ejb3.proxy.factory.session.stateful.StatefulSessionRemoteProxyFactory;
-import org.jboss.ejb3.proxy.handler.session.SessionProxyInvocationHandler;
+import org.jboss.ejb3.proxy.impl.factory.session.stateful.StatefulSessionRemoteProxyFactory;
+import org.jboss.ejb3.proxy.impl.handler.session.SessionProxyInvocationHandler;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
More information about the jboss-cvs-commits
mailing list