Author: mwringe Date: 2009-03-27 17:28:24 -0400 (Fri, 27 Mar 2009) New Revision: 13098 Removed: modules/deployer/trunk/deployer/src/main/resources/base-aop.xml modules/deployer/trunk/deployer/src/main/resources/deployment-aop.xml Log: Remove old references to aop usage in the deployer. Deleted: modules/deployer/trunk/deployer/src/main/resources/base-aop.xml =================================================================== --- modules/deployer/trunk/deployer/src/main/resources/base-aop.xml 2009-03-27 21:12:45 UTC (rev 13097) +++ modules/deployer/trunk/deployer/src/main/resources/base-aop.xml 2009-03-27 21:28:24 UTC (rev 13098) @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE aop PUBLIC - "-//JBoss//DTD JBOSS AOP 1.0//EN" - "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd"> - -<aop xmlns="urn:jboss:aop-beans:1.0"> - <!-- custom configuration for AOP Security --> - <metadata-loader tag="security" class="org.jboss.aspects.security.SecurityClassMetaDataLoader"/> - - <stack name="J2EESecurityStack"> - <interceptor factory="org.jboss.aspects.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/> - <interceptor factory="org.jboss.aspects.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/> - <interceptor factory="org.jboss.aspects.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/> - </stack> - - <bind pointcut="all(@security)"> - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut=&quot;all((a)org.jboss.aspects.security.Permissions)&quot;&gt; - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut=&quot;all((a)org.jboss.aspects.security.Unchecked)&quot;&gt; - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut=&quot;all((a)org.jboss.aspects.security.Exclude)&quot;&gt; - <stack-ref name="J2EESecurityStack"/> - </bind> - - <introduction expr=&quot;class((a)org.jboss.aspects.jmx.MBean)&quot;&gt; - <mixin> - <interfaces>javax.management.DynamicMBean</interfaces> - <class>org.jboss.aspects.jmx.JmxIntrospectingMixin</class> - <construction>new org.jboss.aspects.jmx.JmxIntrospectingMixin(this)</construction> - </mixin> - </introduction> - - <!-- asynchronous aspect --> - <aspect class="org.jboss.aspects.asynch.AsynchAspect" scope="PER_INSTANCE"> - <advisor-attribute name="Advisor"/> - </aspect> - - <bind pointcut="execution(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))"> - <advice name="execute" aspect="org.jboss.aspects.asynch.AsynchAspect"/> - </bind> - - <introduction expr="has(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))"> - <mixin> - <interfaces>org.jboss.aspects.asynch.AsynchProvider,org.jboss.aspects.asynch.FutureHolder</interfaces> - <class>org.jboss.aspects.asynch.AsynchMixin</class> - </mixin> - </introduction> - - <!-- old asynch aspect from Claude --> - - <aspect class="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect" scope="PER_VM"/> - - <bind pointcut="execution(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..))"> - <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/> - </bind> - - <introduction - expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class((a)org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)&quot;&gt; - - <mixin> - <interfaces> - org.jboss.aspects.asynchronous.aspects.AsynchronousFacade - </interfaces> - <class>org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl</class> - <construction>new org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl()</construction> - </mixin> - </introduction> - - <!-- TRANSACTIONS --> - <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/> - <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/> - - <bind pointcut="all(@transaction)"> - <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/> - </bind> - - <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" - scope="PER_CLASS"/> - <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" - scope="PER_INSTANCE"/> - - <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))"> - <interceptor-ref name="class-txsynchronized"/> - </bind> - - <bind pointcut="execution(!static * *->@TxSynchronized(..))"> - <interceptor-ref name="instance-txsynchronized"/> - </bind> - - <bind pointcut=&quot;all((a)org.jboss.aspects.tx.Tx)&quot;&gt; - <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/> - </bind> - - <bind - pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))"> - <interceptor-ref name="class-txsynchronized"/> - </bind> - - <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))"> - <interceptor-ref name="instance-txsynchronized"/> - </bind> - - <!-- injection --> - <aspect class="org.jboss.aspects.tx.TransactionInjector"/> - <aspect class="org.jboss.aspects.tx.TransactionManagerInjector"/> - - <bind pointcut="field(javax.transaction.Transaction *-&gt;(a)org.jboss.aspects.Current)&quot;&gt; - <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/> - </bind> - - <bind pointcut="field(javax.transaction.TransactionManager *-&gt;(a)org.jboss.aspects.Injected)&quot;&gt; - <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/> - </bind> - - <bind - pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *-&gt;(a)org.jboss.aspects.Injected)&quot;&gt; - <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/> - </bind> - - <!-- special types --> - <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/> - <bind pointcut="field(* *-&gt;(a)org.jboss.aspects.Threadbased)&quot;&gt; - <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/> - </bind> - - <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/> - <bind pointcut="field(* *-&gt;(a)org.jboss.aspects.tx.TxLocal)&quot;&gt; - <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/> - </bind> - -</aop> Deleted: modules/deployer/trunk/deployer/src/main/resources/deployment-aop.xml =================================================================== --- modules/deployer/trunk/deployer/src/main/resources/deployment-aop.xml 2009-03-27 21:12:45 UTC (rev 13097) +++ modules/deployer/trunk/deployer/src/main/resources/deployment-aop.xml 2009-03-27 21:28:24 UTC (rev 13098) @@ -1,12 +0,0 @@ -<aop xmlns="urn:jboss:aop-beans:1.0"> - <metadata tag="transaction" class="org.jboss.portal.deployer.portlet.InstanceDeployerImpl"> - <method name="deployInstances"> - <trans-attribute>RequiresNew</trans-attribute> - </method> - </metadata> - <metadata tag="transaction" class="org.jboss.portal.deployer.container.ObjectDeployer"> - <method name="deployObjects"> - <trans-attribute>RequiresNew</trans-attribute> - </method> - </metadata> -</aop>