[jboss-cvs] JBossAS SVN: r68169 - in trunk/ejb3: src/resources/test/clusteredsession and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 11 19:51:44 EST 2007
Author: bstansberry at jboss.com
Date: 2007-12-11 19:51:43 -0500 (Tue, 11 Dec 2007)
New Revision: 68169
Added:
trunk/ejb3/src/resources/test/clusteredsession/xpc/
trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/
trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/jboss.xml
trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/persistence.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTester.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterBase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/util/
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/util/ExplicitFailoverInterceptor.java
Removed:
trunk/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTester.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
Modified:
trunk/ejb3/build-test.xml
trunk/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java
Log:
Break clusteredsession-test.jar into smaller jars to speed deployments and reduce deployment noise
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/build-test.xml 2007-12-12 00:51:43 UTC (rev 68169)
@@ -3810,35 +3810,77 @@
<jar jarfile="${build.lib}/clusteredsession-test.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
+ <include name="org/jboss/ejb3/test/clusteredsession/*.class"/>
</fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/util/*.class"/>
+ </fileset>
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
+ <include name="org/jboss/ejb3/test/stateful/nested/base/*.class"/>
</fileset>
<fileset dir="${resources}/test/clusteredsession">
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/clusteredsession-test-scoped.jar">
+
+ <jar jarfile="${build.lib}/clusteredsession-nested.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
+ <include name="org/jboss/ejb3/test/clusteredsession/nested/base/*.class"/>
</fileset>
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
+ <include name="org/jboss/ejb3/test/clusteredsession/nested/base/std/*.class"/>
</fileset>
- <fileset dir="${resources}/test/clusteredsession">
- <include name="META-INF/*.xml"/>
- <exclude name="META-INF/jboss.xml"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/util/*.class"/>
</fileset>
- <fileset dir="${resources}/test/clusteredsession/scoped">
- <include name="META-INF/*.xml"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/std/*.class"/>
</fileset>
</jar>
+
+ <jar jarfile="${build.lib}/clusteredsession-xpc.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/nested/base/xpc/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/util/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/xpc/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredsession/xpc">
+ <include name="META-INF/persistence.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/clusteredsession-xpc-scoped.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/nested/base/xpc/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredsession/util/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/*.class"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/xpc/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredsession/xpc">
+ <include name="META-INF/persistence.xml"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
<jar jarfile="${build.lib}/clusteredsession-local.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredsession/VMTester*.class"/>
+ <include name="org/jboss/ejb3/test/clusteredsession/islocal/*.class"/>
</fileset>
<fileset dir="${resources}/test/clusteredsession/islocal">
<include name="META-INF/*.xml"/>
Deleted: trunk/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence>
- <persistence-unit name="tempdb">
- <jta-data-source>java:/DefaultDS</jta-data-source>
- <properties>
- <property name="hibernate.session_factory_name" value="tempdb"/>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
- </properties>
- </persistence-unit>
-</persistence>
Modified: trunk/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/resources/test/clusteredsession/islocal/META-INF/ejb-jar.xml 2007-12-12 00:51:43 UTC (rev 68169)
@@ -8,29 +8,29 @@
<enterprise-beans>
<session>
<ejb-name>NonClusteredStateless</ejb-name>
- <remote>org.jboss.ejb3.test.clusteredsession.VMTester</remote>
- <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatelessBean</ejb-class>
+ <remote>org.jboss.ejb3.test.clusteredsession.islocal.VMTester</remote>
+ <ejb-class>org.jboss.ejb3.test.clusteredsession.islocal.VMTesterStatelessBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
<session>
<ejb-name>ClusteredStateless</ejb-name>
- <remote>org.jboss.ejb3.test.clusteredsession.VMTester</remote>
- <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatelessBean</ejb-class>
+ <remote>org.jboss.ejb3.test.clusteredsession.islocal.VMTester</remote>
+ <ejb-class>org.jboss.ejb3.test.clusteredsession.islocal.VMTesterStatelessBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
<session>
<ejb-name>NonClusteredStateful</ejb-name>
- <remote>org.jboss.ejb3.test.clusteredsession.VMTester</remote>
- <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatefulBean</ejb-class>
+ <remote>org.jboss.ejb3.test.clusteredsession.islocal.VMTester</remote>
+ <ejb-class>org.jboss.ejb3.test.clusteredsession.islocal.VMTesterStatefulBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
<session>
<ejb-name>ClusteredStateful</ejb-name>
- <remote>org.jboss.ejb3.test.clusteredsession.VMTester</remote>
- <ejb-class>org.jboss.ejb3.test.clusteredsession.VMTesterStatefulBean</ejb-class>
+ <remote>org.jboss.ejb3.test.clusteredsession.islocal.VMTester</remote>
+ <ejb-class>org.jboss.ejb3.test.clusteredsession.islocal.VMTesterStatefulBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
Added: trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/jboss.xml (rev 0)
+++ trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/jboss.xml 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<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">
+
+ <loader-repository>test,ejb3:loader=testClusteredSessionXPC</loader-repository>
+</jboss>
\ No newline at end of file
Copied: trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/persistence.xml (from rev 68098, trunk/ejb3/src/resources/test/clusteredsession/META-INF/persistence.xml)
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/persistence.xml (rev 0)
+++ trunk/ejb3/src/resources/test/clusteredsession/xpc/META-INF/persistence.xml 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+ <persistence-unit name="tempdb">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ <properties>
+ <property name="hibernate.session_factory_name" value="tempdb"/>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit>
+</persistence>
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import org.jboss.ha.framework.interfaces.GenericClusteringException;
-import org.jboss.logging.Logger;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-/**
- * Used for testing clustering: allows to explicitly makes a call to node fail
- * This will mimic a dead server. This is used as a ejb3 interceptor now.
- * @author Ben Wang
- *
- */
-public class ExplicitFailoverInterceptor
-{
- private Logger log = Logger.getLogger(ExplicitFailoverInterceptor.class);
-
- @AroundInvoke
- public Object invoke(InvocationContext ctx)
- throws Exception
- {
- checkFailoverNeed (ctx);
- return ctx.proceed();
- }
-
- protected void checkFailoverNeed (InvocationContext ctx)
- throws Exception
- {
- if(ctx.getMethod().getName().equals("setUpFailover"))
- {
- return;
- }
-
- String failover = (String)System.getProperty ("JBossCluster-DoFail");
- boolean doFail = false;
-
- if (failover != null)
- {
- String strFailover = failover;
- if (strFailover.equalsIgnoreCase ("true"))
- {
- doFail = true;
- }
- else if (strFailover.equalsIgnoreCase ("once"))
- {
- doFail = true;
- System.setProperty ("JBossCluster-DoFail", "false");
- }
- }
-
- if (doFail)
- {
- GenericClusteringException e = new GenericClusteringException
- (GenericClusteringException.COMPLETED_NO, "Test failover from ejb interceptor", false);
-
- log.debug ("WE FAILOVER IN EJB INTERCEPTOR (explicit failover)!", e);
-
- throw e;
- }
- }
-}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/NonAnnotationStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -30,6 +30,7 @@
import javax.ejb.Remove;
import javax.interceptor.Interceptors;
+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;
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/Session.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredsession;
-
-
-
-/**
- * SLSB interface
- *
- * @author Ben Wang
- * @version $Revision$
- */
-public interface Session
-{
- void test();
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.Clustered;
-
-/**
- * Comment
- *
- * @author Ben Wang
- * @version $Revision$
- */
- at Stateless(name="testStateless")
- at Clustered
- at Remote(Session.class)
-public class SessionBean implements Session
-{
- public void test()
- {
- System.out.println("hello!!!");
- }
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTester.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTester.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTester.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-
-import javax.naming.NamingException;
-
-/**
- * Provides access to a static VMID field and ability to
- * download a remote proxy and check the VMID of its bean.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision$
- */
-public interface VMTester
-{
- public static final VMID VMID = new VMID();
-
- VMID getVMID();
-
- VMID getVMIDFromRemote(VMTester remote) throws NamingException;
-
- VMID getVMIDFromRemoteLookup(String jndiURL, String name) throws NamingException;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import java.rmi.dgc.VMID;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author Brian Stansberry
- */
-public class VMTesterBase
-{
- private static final Logger log = Logger.getLogger(VMTesterBase.class);
-
- public VMID getVMID()
- {
- log.debug("Ignore; just a stack trace", new Exception("Ignore; just a stack trace"));
- return VMTester.VMID;
- }
-
- public VMID getVMIDFromRemoteLookup(String jndiURL, String name)
- throws NamingException
- {
- log.info("Looking up " + jndiURL + "/" + name);
- Properties env = new Properties();
- env.setProperty(Context.PROVIDER_URL, jndiURL);
- env.setProperty("jnp.disableDiscovery", "true");
- InitialContext ctx = new InitialContext(env);
- VMTester tester = (VMTester) ctx.lookup(name);
- return tester.getVMID();
- }
-
- public VMID getVMIDFromRemote(VMTester remote)
- {
- return remote.getVMID();
- }
-
-
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-/**
- * @author Brian Stansberry
- */
- at Stateful
- at Remote(VMTester.class)
-public class VMTesterStatefulBean extends VMTesterBase implements VMTester
-{
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-/**
- * @author Brian Stansberry
- */
- at Stateless
- at Remote(VMTester.class)
-public class VMTesterStatelessBean extends VMTesterBase implements VMTester
-{
-}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTester.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTester.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTester.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTester.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.islocal;
+
+import java.rmi.dgc.VMID;
+
+import javax.naming.NamingException;
+
+/**
+ * Provides access to a static VMID field and ability to
+ * download a remote proxy and check the VMID of its bean.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision$
+ */
+public interface VMTester
+{
+ public static final VMID VMID = new VMID();
+
+ VMID getVMID();
+
+ VMID getVMIDFromRemote(VMTester remote) throws NamingException;
+
+ VMID getVMIDFromRemoteLookup(String jndiURL, String name) throws NamingException;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterBase.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterBase.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterBase.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterBase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.islocal;
+
+import java.rmi.dgc.VMID;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author Brian Stansberry
+ */
+public class VMTesterBase
+{
+ private static final Logger log = Logger.getLogger(VMTesterBase.class);
+
+ public VMID getVMID()
+ {
+ log.debug("Ignore; just a stack trace", new Exception("Ignore; just a stack trace"));
+ return VMTester.VMID;
+ }
+
+ public VMID getVMIDFromRemoteLookup(String jndiURL, String name)
+ throws NamingException
+ {
+ log.info("Looking up " + jndiURL + "/" + name);
+ Properties env = new Properties();
+ env.setProperty(Context.PROVIDER_URL, jndiURL);
+ env.setProperty("jnp.disableDiscovery", "true");
+ InitialContext ctx = new InitialContext(env);
+ VMTester tester = (VMTester) ctx.lookup(name);
+ return tester.getVMID();
+ }
+
+ public VMID getVMIDFromRemote(VMTester remote)
+ {
+ return remote.getVMID();
+ }
+
+
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatefulBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatefulBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatefulBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.islocal;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+/**
+ * @author Brian Stansberry
+ */
+ at Stateful
+ at Remote(VMTester.class)
+public class VMTesterStatefulBean extends VMTesterBase implements VMTester
+{
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatelessBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/VMTesterStatelessBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatelessBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/islocal/VMTesterStatelessBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.islocal;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+
+/**
+ * @author Brian Stansberry
+ */
+ at Stateless
+ at Remote(VMTester.class)
+public class VMTesterStatelessBean extends VMTesterBase implements VMTester
+{
+}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
-
-/**
- * A ClusteredDeepNestedStatefulBean.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful(name="testDeepNestedContained")
- at Clustered
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
- at Local(DeepNestedContained.class)
-public class ClusteredDeepNestedContainedBean extends DeepNestedContainedBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
-import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
-
-/**
- * A ClusteredDeepNestedStatefulBean.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful(name="testDeepNestedStateful")
- at Clustered
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
- at Local(DeepNestedStateful.class)
-public class ClusteredDeepNestedStatefulBean extends DeepNestedStatefulBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
-
-/**
- * ContainedBean bean meant for testing with a clustered SFSB cache.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful(name="testLocalShoppingCartContained")
- at Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
- at Local(Contained.class)
-public class ClusteredLocalContainedBean extends ContainedBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
-import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
-
-/**
- * Nested SFSB with only a local interface.
- *
- * @author Ben Wang
- * @author Brian Stansberry
- *
- * @version $Revision: 45372 $
- */
- at Clustered
- at Stateful(name="testLocalNestedStateful")
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1)
- at Local(NestedStateful.class)
-public class ClusteredLocalNestedStatefulBean extends NestedStatefulBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import java.rmi.dgc.VMID;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.interceptor.Interceptors;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
-import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
-import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
-
-/**
- * Parent SFSB that contains nested SFSB.
- *
- * @author Ben Wang
- * @author Brian Stansberry
- * @version $Revision: 60408 $
- */
- at Clustered
- at Stateful(name="testParentStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
- at Remote(ParentStatefulRemote.class)
-public class ClusteredParentStatefulBean extends ParentStatefulBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
- // Mimic explict failover
- @Interceptors({ExplicitFailoverInterceptor.class})
- public VMID getVMID()
- {
- return super.getVMID();
- }
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
-
-/**
- * ContainedBean bean meant for testing with a clustered SFSB cache.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful(name="testShoppingCartContained")
- at Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
- at Remote(Contained.class)
-public class ClusteredRemoteContainedBean extends ContainedBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
-import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
-
-/**
- * Nested SFSB with a remote interface.
- *
- * @author Ben Wang
- * @author Brian Stansberry
- *
- * @version $Revision: 60066 $
- */
- at Clustered
- at Stateful(name="testNestedStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1)
- at Remote(NestedStateful.class)
-public class ClusteredRemoteNestedStatefulBean extends OptimizedNestedStatefulBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-}
Deleted: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.ejb3.test.clusteredsession.nested;
-
-import java.rmi.dgc.VMID;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.interceptor.Interceptors;
-
-import org.jboss.ejb3.annotation.CacheConfig;
-import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
-import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
-
-/**
- * ShoppingCartBean subclass for testing with a clustered SFSB cache.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
- */
- at Stateful(name="testShoppingCart")
- at Remote(ShoppingCart.class)
- at Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
-public class ClusteredShoppingCartBean extends ShoppingCartBean
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
- // Mimic explict failover
- @Interceptors({ExplicitFailoverInterceptor.class})
- public VMID getVMID()
- {
- return super.getVMID();
- }
-}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
+import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
+
+/**
+ * A ClusteredDeepNestedStatefulBean.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful(name="testDeepNestedStateful")
+ at Clustered
+ at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
+ at Local(DeepNestedStateful.class)
+public class ClusteredDeepNestedStatefulBean extends DeepNestedStatefulBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.std;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
+import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
+
+/**
+ * Nested SFSB with only a local interface.
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ *
+ * @version $Revision: 45372 $
+ */
+ at Clustered
+ at Stateful(name="testLocalNestedStateful")
+ at CacheConfig(maxSize=10000, idleTimeoutSeconds=1)
+ at Local(NestedStateful.class)
+public class ClusteredLocalNestedStatefulBean extends NestedStatefulBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.std;
+
+import java.rmi.dgc.VMID;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.interceptor.Interceptors;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.clusteredsession.util.ExplicitFailoverInterceptor;
+import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
+import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
+
+/**
+ * Parent SFSB that contains nested SFSB.
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ * @version $Revision: 60408 $
+ */
+ at Clustered
+ at Stateful(name="testParentStateful")
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
+ at Remote(ParentStatefulRemote.class)
+public class ClusteredParentStatefulBean extends ParentStatefulBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ // Mimic explict failover
+ @Interceptors({ExplicitFailoverInterceptor.class})
+ public VMID getVMID()
+ {
+ return super.getVMID();
+ }
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.std;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
+import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
+
+/**
+ * Nested SFSB with a remote interface.
+ *
+ * @author Ben Wang
+ * @author Brian Stansberry
+ *
+ * @version $Revision: 60066 $
+ */
+ at Clustered
+ at Stateful(name="testNestedStateful")
+ at CacheConfig(maxSize=1000, idleTimeoutSeconds=1)
+ at Remote(NestedStateful.class)
+public class ClusteredRemoteNestedStatefulBean extends OptimizedNestedStatefulBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.xpc;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
+
+/**
+ * A ClusteredDeepNestedStatefulBean.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful(name="testDeepNestedContained")
+ at Clustered
+ at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
+ at Local(DeepNestedContained.class)
+public class ClusteredDeepNestedContainedBean extends DeepNestedContainedBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.xpc;
+
+import javax.ejb.Local;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
+
+/**
+ * ContainedBean bean meant for testing with a clustered SFSB cache.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful(name="testLocalShoppingCartContained")
+ at Clustered
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at Local(Contained.class)
+public class ClusteredLocalContainedBean extends ContainedBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.xpc;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
+
+/**
+ * ContainedBean bean meant for testing with a clustered SFSB cache.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful(name="testShoppingCartContained")
+ at Clustered
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at Remote(Contained.class)
+public class ClusteredRemoteContainedBean extends ContainedBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+}
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.nested.base.xpc;
+
+import java.rmi.dgc.VMID;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+import javax.interceptor.Interceptors;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.ejb3.test.clusteredsession.util.ExplicitFailoverInterceptor;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
+import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
+
+/**
+ * ShoppingCartBean subclass for testing with a clustered SFSB cache.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful(name="testShoppingCart")
+ at Remote(ShoppingCart.class)
+ at Clustered
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+public class ClusteredShoppingCartBean extends ShoppingCartBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ // Mimic explict failover
+ @Interceptors({ExplicitFailoverInterceptor.class})
+ public VMID getVMID()
+ {
+ return super.getVMID();
+ }
+}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ExtendedPersistenceUnitTestCase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -63,7 +63,7 @@
{
TestSuite suite = new TestSuite();
Test t1 = getDeploySetup(ExtendedPersistenceUnitTestCase.class,
- "clusteredsession-test.jar");
+ "clusteredsession-xpc.jar");
suite.addTest(t1);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -30,7 +30,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.jboss.ejb3.test.clusteredsession.VMTester;
+import org.jboss.ejb3.test.clusteredsession.islocal.VMTester;
import org.jboss.test.JBossClusteredTestCase;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/NestedBeanUnitTestCase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -55,10 +55,8 @@
public static Test suite() throws Exception
{
- final String jarName = "clusteredsession-test.jar";
- Test t1 = getDeploySetup(NestedBeanUnitTestCase.class,
- jarName);
- return t1;
+ return getDeploySetup(NestedBeanUnitTestCase.class,
+ "clusteredsession-nested.jar");
}
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -50,12 +50,12 @@
private static boolean deployed0 = true;
private static boolean deployed1 = true;
- private static final String NAME_BASE= "jar=";
+ private static final String NAME_BASE= "jboss.j2ee:jar=";
private static final String deployment = "clusteredsession-test.jar";
private static final String BEAN_PREFIX = ",name=";
private static final String SLSB = "clusteredStateless";
private static final String SFSB = "testStateful";
- private static final String NAME_QUALIFIER = "socketDefaultPartition";
+ private static final String NAME_QUALIFIER = ",service=EJB3socketDefaultPartition";
/**
* Create a new RedeployUnitTestCase.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ScopedExtendedPersistenceUnitTestCase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -44,7 +44,7 @@
{
TestSuite suite = new TestSuite();
Test t1 = getDeploySetup(ScopedExtendedPersistenceUnitTestCase.class,
- "clusteredsession-test-scoped.jar");
+ "clusteredsession-xpc-scoped.jar");
suite.addTest(t1);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java 2007-12-12 00:47:07 UTC (rev 68168)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/SimpleIsLocalInterceptorUnitTestCase.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -30,7 +30,7 @@
import junit.framework.Test;
-import org.jboss.ejb3.test.clusteredsession.VMTester;
+import org.jboss.ejb3.test.clusteredsession.islocal.VMTester;
import org.jboss.test.JBossClusteredTestCase;
/**
Copied: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/util/ExplicitFailoverInterceptor.java (from rev 68098, trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ExplicitFailoverInterceptor.java)
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/util/ExplicitFailoverInterceptor.java (rev 0)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/util/ExplicitFailoverInterceptor.java 2007-12-12 00:51:43 UTC (rev 68169)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb3.test.clusteredsession.util;
+
+import org.jboss.ha.framework.interfaces.GenericClusteringException;
+import org.jboss.logging.Logger;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+/**
+ * Used for testing clustering: allows to explicitly makes a call to node fail
+ * This will mimic a dead server. This is used as a ejb3 interceptor now.
+ * @author Ben Wang
+ *
+ */
+public class ExplicitFailoverInterceptor
+{
+ private Logger log = Logger.getLogger(ExplicitFailoverInterceptor.class);
+
+ @AroundInvoke
+ public Object invoke(InvocationContext ctx)
+ throws Exception
+ {
+ checkFailoverNeed (ctx);
+ return ctx.proceed();
+ }
+
+ protected void checkFailoverNeed (InvocationContext ctx)
+ throws Exception
+ {
+ if(ctx.getMethod().getName().equals("setUpFailover"))
+ {
+ return;
+ }
+
+ String failover = (String)System.getProperty ("JBossCluster-DoFail");
+ boolean doFail = false;
+
+ if (failover != null)
+ {
+ String strFailover = failover;
+ if (strFailover.equalsIgnoreCase ("true"))
+ {
+ doFail = true;
+ }
+ else if (strFailover.equalsIgnoreCase ("once"))
+ {
+ doFail = true;
+ System.setProperty ("JBossCluster-DoFail", "false");
+ }
+ }
+
+ if (doFail)
+ {
+ GenericClusteringException e = new GenericClusteringException
+ (GenericClusteringException.COMPLETED_NO, "Test failover from ejb interceptor", false);
+
+ log.debug ("WE FAILOVER IN EJB INTERCEPTOR (explicit failover)!", e);
+
+ throw e;
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list