[jboss-cvs] JBossAS SVN: r92103 - in projects/ejb3/trunk: core/src/main/resources and 1 other directories.

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

Author: ALRubinger
Date: 2009-08-07 01:53:04 -0400 (Fri, 07 Aug 2009)
New Revision: 92103

Modified:
   projects/ejb3/trunk/as-int/pom.xml
   projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
   projects/ejb3/trunk/ejb3/pom.xml
Log:
[EJBTHREE-1738] Process @RunAs in @Service start(), update the dependency chain to bring in new ejb3-core

Modified: projects/ejb3/trunk/as-int/pom.xml
===================================================================
--- projects/ejb3/trunk/as-int/pom.xml	2009-08-07 05:51:29 UTC (rev 92102)
+++ projects/ejb3/trunk/as-int/pom.xml	2009-08-07 05:53:04 UTC (rev 92103)
@@ -29,7 +29,7 @@
     into the AS
     
      -->
-    <version.org.jboss.ejb3_jboss.ejb3>1.1.10</version.org.jboss.ejb3_jboss.ejb3>
+    <version.org.jboss.ejb3_jboss.ejb3>1.1.11-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3>
     <version.org.jboss.ejb3_jboss.ejb3.metrics.deployer>1.0.1</version.org.jboss.ejb3_jboss.ejb3.metrics.deployer>
     <version.org.jboss.ejb3_mc.int>1.0.1</version.org.jboss.ejb3_mc.int>
   

Modified: projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml	2009-08-07 05:51:29 UTC (rev 92102)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml	2009-08-07 05:53:04 UTC (rev 92103)
@@ -383,8 +383,8 @@
    </domain>
 
    <domain name="Service Bean" extends="Intercepted Bean" inheritBindings="true">
-      <!-- Override the default LifecycleCallbackStack so a tx context is set -->
-      <stack name="LifecycleCallbackStack">
+      <!-- Define a  ServiceLifecycleCallbackStack so a tx context is set -->
+      <stack name="ServiceLifecycleCallbackStack">
          <interceptor-ref name="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor"/>
          <advice name="setup" aspect="InvocationContextInterceptor"/>
          <!-- TODO: EJB 3.1 PFD 4.8.3: if REQUIRED then interpret as REQUIRES_NEW -->
@@ -403,7 +403,7 @@
       <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..)) AND !execution(* *->create()) AND !execution(* *->start()) AND !execution(* *->stop()) AND !execution(* *->destroy())">
          <interceptor-ref name="Basic Authorization"/>
       </bind>
-      <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start()) AND !execution(* *->stop()) AND !execution(* *->destroy())">
+      <bind pointcut="execution(public * *->*(..))">
          <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
       </bind>
       <bind pointcut="execution(public * *->*(..))">
@@ -429,7 +429,7 @@
       <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..)) AND !execution(* *->create()) AND !execution(* *->start()) AND !execution(* *->stop()) AND !execution(* *->destroy())">
          <interceptor-ref name="Basic Authorization"/>
       </bind>
-      <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start()) AND !execution(* *->destroy())">
+      <bind pointcut="execution(public * *->*(..))">
          <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
       </bind>
       <bind pointcut="execution(public * *->*(..))">

Modified: projects/ejb3/trunk/ejb3/pom.xml
===================================================================
--- projects/ejb3/trunk/ejb3/pom.xml	2009-08-07 05:51:29 UTC (rev 92102)
+++ projects/ejb3/trunk/ejb3/pom.xml	2009-08-07 05:53:04 UTC (rev 92103)
@@ -1,4 +1,5 @@
 <!--
+
   vi:ts=2:sw=2:expandtab
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -34,7 +35,7 @@
     into the AS
     
      -->
-    <version.org.jboss.ejb3_core>1.1.10</version.org.jboss.ejb3_core>
+    <version.org.jboss.ejb3_core>1.1.11-SNAPSHOT</version.org.jboss.ejb3_core>
     <version.org.jboss.ejb3_deployers>1.0.0</version.org.jboss.ejb3_deployers>
   
   </properties>