[jboss-cvs] JBossAS SVN: r57530 - in trunk/ejb3/src/resources: . META-INF test/aspectdomain test/stateful test-configs/ejb3-jacc/deploy

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

Author: kabir.khan at jboss.com
Date: 2006-10-10 06:15:54 -0400 (Tue, 10 Oct 2006)
New Revision: 57530

Modified:
   trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
   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/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml
   trunk/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
Log:
[JBAOP-291] Update location of jboss-aop_1_0.dtd

Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2006-10-10 10:15:12 UTC (rev 57529)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2006-10-10 10:15:54 UTC (rev 57530)
@@ -105,6 +105,7 @@
             <value>servlets-webdav.jar</value>
          </set>
       </property>
+      <depends>AspectDeployer</depends>
    </bean>
    <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
       <install bean="MainDeployer" method="addDeployer">
@@ -117,5 +118,6 @@
             <this/>
          </parameter>
       </uninstall>
+      <depends>AspectDeployer</depends>
    </bean>
 </deployment>

Modified: trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-interceptors-aop.xml	2006-10-10 10:15:12 UTC (rev 57529)
+++ trunk/ejb3/src/resources/ejb3-interceptors-aop.xml	2006-10-10 10:15:54 UTC (rev 57530)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
@@ -284,7 +284,7 @@
          @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
       </annotation>
    </domain>
-   
+
    <domain name="Consumer Bean">
       <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
          <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
@@ -313,7 +313,7 @@
       </bind>
       <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
          <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>      
+      </bind>
       <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
          <interceptor-ref name="Basic Authorization"/>
       </bind>
@@ -338,7 +338,7 @@
       </bind>
       <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
          <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>      
+      </bind>
       <bind pointcut="execution(public * @org.jboss.annotation.security.SecurityDomain->*(..))">
          <interceptor-ref name="Basic Authorization"/>
       </bind>

Modified: trunk/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	2006-10-10 10:15:12 UTC (rev 57529)
+++ trunk/ejb3/src/resources/test/aspectdomain/aspectdomain-ejb3-interceptors-aop.xml	2006-10-10 10:15:54 UTC (rev 57530)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <interceptor class="org.jboss.ejb3.test.aspectdomain.TestInterceptor" scope="PER_VM"/>

Modified: trunk/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	2006-10-10 10:15:12 UTC (rev 57529)
+++ trunk/ejb3/src/resources/test/stateful/statefulTest-ejb3-interceptors-aop.xml	2006-10-10 10:15:54 UTC (rev 57530)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <interceptor class="org.jboss.ejb3.test.stateful.RemoteBindingInterceptor" scope="PER_VM"/>

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	2006-10-10 10:15:12 UTC (rev 57529)
+++ trunk/ejb3/src/resources/test-configs/ejb3-jacc/deploy/ejb3-interceptors-aop.xml	2006-10-10 10:15:54 UTC (rev 57530)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE aop PUBLIC
 "-//JBoss//DTD JBOSS AOP 1.0//EN"
-"http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+"http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
 
 <aop>
    <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>