[jboss-cvs] JBossAS SVN: r67957 - trunk/ejb3/src/resources/test/ejbthree1090.

[jboss-cvs-commits at lists.jboss.org]

Author: bdecoste
Date: 2007-12-05 15:24:22 -0500 (Wed, 05 Dec 2007)
New Revision: 67957

Modified:
   trunk/ejb3/src/resources/test/ejbthree1090/ejbthree1090-ejb3-interceptors-aop.xml
Log:
[EJBTHREE-1120] merged tests from Branch_4_2

Modified: trunk/ejb3/src/resources/test/ejbthree1090/ejbthree1090-ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/ejbthree1090/ejbthree1090-ejb3-interceptors-aop.xml	2007-12-05 19:23:49 UTC (rev 67956)
+++ trunk/ejb3/src/resources/test/ejbthree1090/ejbthree1090-ejb3-interceptors-aop.xml	2007-12-05 20:24:22 UTC (rev 67957)
@@ -12,13 +12,13 @@
          <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
          <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
       </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
+      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
          <interceptor-ref name="Basic Authorization"/>
       </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
+      <bind pointcut="execution(public * *->*(..))">
          <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
       </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
+      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
          <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
       </bind>
       <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
@@ -38,7 +38,7 @@
          <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
       </bind>
 
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
+      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
          <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
       </bind>
 
@@ -46,9 +46,12 @@
          <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
       </bind>
 
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
+         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
       </annotation>
+      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
+         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
+      </annotation>
       
    </domain>
 
@@ -59,25 +62,25 @@
       </bind> 
       
       <!-- NON Clustered cache configuration -->
-      <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 expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+         @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
       </annotation>
-      <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 expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+         @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
       </annotation>
-      <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 expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
+         @org.jboss.ejb3.annotation.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.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
+         @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
       </annotation>
-      <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 expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
+         @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
       </annotation>
       
-      <annotation expr="!class(@javax.interceptors.Interceptors)">
+      <annotation expr="!class(@javax.interceptor.Interceptors)">
          @javax.interceptor.Interceptors (value={org.jboss.ejb3.test.ejbthree1090.Ejb3Interceptor.class})
       </annotation>
    </domain>