[jboss-cvs] JBossAS SVN: r67094 - in trunk/ejb3/src: main/org/jboss/ejb3/stateful and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 14 15:26:36 EST 2007
Author: ALRubinger
Date: 2007-11-14 15:26:35 -0500 (Wed, 14 Nov 2007)
New Revision: 67094
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.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
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
Log:
Missed commits from moving @Clustered
Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -55,7 +55,7 @@
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.security.SecurityDomain;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassContainer;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -64,6 +64,8 @@
import org.jboss.annotation.IgnoreDependency;
import org.jboss.annotation.IgnoreDependencyImpl;
+import org.jboss.annotation.ejb.Clustered;
+import org.jboss.annotation.ejb.ClusteredImpl;
import org.jboss.annotation.ejb.Consumer;
import org.jboss.annotation.ejb.ConsumerImpl;
import org.jboss.annotation.ejb.CurrentMessage;
@@ -106,8 +108,6 @@
import org.jboss.annotation.ejb.cache.CacheImpl;
import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
import org.jboss.annotation.ejb.cache.simple.PersistenceManagerImpl;
-import org.jboss.annotation.ha.Clustered;
-import org.jboss.annotation.ha.ClusteredImpl;
import org.jboss.annotation.internal.DefaultInterceptorMarker;
import org.jboss.annotation.internal.DefaultInterceptorMarkerImpl;
import org.jboss.annotation.security.RunAsPrincipalImpl;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -27,8 +27,8 @@
import javax.naming.NamingException;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.Dispatcher;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -40,11 +40,11 @@
import javax.ejb.RemoteHome;
import javax.ejb.TimerService;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.joinpoint.Invocation;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,8 +24,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AdviceStack;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessContainer.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -32,10 +32,10 @@
import javax.ejb.TimerService;
import javax.naming.NamingException;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.aop.AspectManager;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.joinpoint.Invocation;
Modified: trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-14 20:26:35 UTC (rev 67094)
@@ -96,7 +96,7 @@
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -127,7 +127,7 @@
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -158,7 +158,7 @@
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -178,7 +178,7 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
@@ -196,21 +196,21 @@
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -227,7 +227,7 @@
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -248,7 +248,7 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
@@ -259,21 +259,21 @@
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
Modified: trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/resources/test/defaultremotebindings/default-ejb3-interceptors-aop.xml 2007-11-14 20:26:35 UTC (rev 67094)
@@ -28,7 +28,7 @@
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
Modified: trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml 2007-11-14 20:26:35 UTC (rev 67094)
@@ -91,7 +91,7 @@
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->*(..))">
@@ -119,7 +119,7 @@
<bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(* *->@javax.ejb.Remove(..))">
@@ -135,7 +135,7 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(* @org.jboss.annotation.ha.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
@@ -146,21 +146,21 @@
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
</annotation>
</domain>
Modified: trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/resources/test-configs/removedislocal/deploy/ejb3-interceptors-aop.xml 2007-11-14 20:26:35 UTC (rev 67094)
@@ -96,7 +96,7 @@
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -124,7 +124,7 @@
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
@@ -152,7 +152,7 @@
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -172,7 +172,7 @@
<interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
@@ -187,21 +187,21 @@
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -218,7 +218,7 @@
<bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -239,7 +239,7 @@
<interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
</bind>
- <bind pointcut="execution(public * @org.jboss.annotation.ha.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+ <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
<interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
</bind>
<annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
@@ -247,21 +247,21 @@
</annotation>
<!-- NON Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ha.Clustered)">
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatefulClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/StatelessClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,7 +24,7 @@
import javax.ejb.Stateless;
import javax.ejb.Remote;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredservice/ServiceBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -23,10 +23,10 @@
import javax.ejb.Remote;
import javax.ejb.Local;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.Depends;
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Service;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -7,7 +7,7 @@
package org.jboss.ejb3.test.clusteredsession;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.ha.framework.interfaces.RoundRobin;
import javax.ejb.Stateless;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
/**
* Stateful bean that configures clustering via annotations.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.cache.Optimized;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideAnnotationStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,7 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
* SFSB whose clustering annotations are overridden in xml.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.logging.Logger;
import org.jboss.system.server.ServerConfig;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/SessionBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,7 +24,7 @@
import javax.ejb.Stateless;
import javax.ejb.Remote;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -24,8 +24,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
/**
* Stateful bean that configures clustering via annotations.
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,8 +25,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -10,8 +10,8 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -13,8 +13,8 @@
import javax.ejb.Stateful;
import javax.interceptor.Interceptors;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.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;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,8 +25,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -10,8 +10,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
Modified: 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-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -28,8 +28,8 @@
import javax.ejb.Stateful;
import javax.interceptor.Interceptors;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.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;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -31,7 +31,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatefulClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/localcall/StatelessClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatefulClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -27,9 +27,9 @@
import javax.ejb.Stateful;
import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ha.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssl/StatelessClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -27,10 +27,10 @@
import javax.ejb.Stateless;
import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ha.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/OverrideStatefulClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ha.Clustered;
+import org.jboss.annotation.ejb.Clustered;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatefulClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,9 +25,10 @@
import java.io.Serializable;
import javax.ejb.Remote;
import javax.ejb.Stateful;
+
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ha.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ssladvanced/StatelessClusteredBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -27,10 +27,10 @@
import javax.ejb.Stateless;
import javax.ejb.Remote;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.RemoteBindings;
-import org.jboss.annotation.ha.Clustered;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -38,9 +38,9 @@
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.annotation.security.SecurityDomain;
import org.jboss.ejb3.Container;
import org.jboss.logging.Logger;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-14 20:15:48 UTC (rev 67093)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-14 20:26:35 UTC (rev 67094)
@@ -25,8 +25,8 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.cache.CacheConfig;
-import org.jboss.annotation.ha.Clustered;
import org.jboss.logging.Logger;
/**
More information about the jboss-cvs-commits
mailing list