[jboss-cvs] JBossAS SVN: r94036 - in trunk/aspects/src: assembly/resources and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 25 16:13:32 EDT 2009
Author: pgier
Date: 2009-09-25 16:13:31 -0400 (Fri, 25 Sep 2009)
New Revision: 94036
Added:
trunk/aspects/src/assembly/resources/
trunk/aspects/src/assembly/resources/META-INF/
trunk/aspects/src/assembly/resources/ReadMe.txt
trunk/aspects/src/assembly/resources/base-aop.xml
trunk/aspects/src/assembly/resources/org/
Removed:
trunk/aspects/src/etc/META-INF/
trunk/aspects/src/etc/ReadMe.txt
trunk/aspects/src/etc/base-aop.xml
trunk/aspects/src/etc/default.mf
trunk/aspects/src/etc/org/
Modified:
trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml
trunk/aspects/src/assembly/jboss-aspect-library.xml
Log:
[JBBUILD-541] Move assembly resources into assembly source directory.
Modified: trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml 2009-09-25 20:08:46 UTC (rev 94035)
+++ trunk/aspects/src/assembly/jboss-aop-jboss5-deployer.xml 2009-09-25 20:13:31 UTC (rev 94036)
@@ -15,12 +15,12 @@
</fileSets>
<files>
<file>
- <source>src/etc/base-aop.xml</source>
+ <source>src/assembly/resources/base-aop.xml</source>
<outputDirectory>/</outputDirectory>
<destName>base-aspects.xml</destName>
</file>
<file>
- <source>src/etc/META-INF/jboss-aspect-library-jboss-beans.xml</source>
+ <source>src/assembly/resources/META-INF/jboss-aspect-library-jboss-beans.xml</source>
<outputDirectory>/META-INF</outputDirectory>
</file>
</files>
Modified: trunk/aspects/src/assembly/jboss-aspect-library.xml
===================================================================
--- trunk/aspects/src/assembly/jboss-aspect-library.xml 2009-09-25 20:08:46 UTC (rev 94035)
+++ trunk/aspects/src/assembly/jboss-aspect-library.xml 2009-09-25 20:13:31 UTC (rev 94036)
@@ -14,7 +14,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/etc</directory>
+ <directory>src/assembly/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>org/jboss/**/*.xml</include>
Copied: trunk/aspects/src/assembly/resources/META-INF (from rev 94031, trunk/aspects/src/etc/META-INF)
Property changes on: trunk/aspects/src/assembly/resources/META-INF
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/aspects/src/assembly/resources/ReadMe.txt (from rev 94031, trunk/aspects/src/etc/ReadMe.txt)
===================================================================
--- trunk/aspects/src/assembly/resources/ReadMe.txt (rev 0)
+++ trunk/aspects/src/assembly/resources/ReadMe.txt 2009-09-25 20:13:31 UTC (rev 94036)
@@ -0,0 +1,6 @@
+* If installing in a version before JBoss 4.0.4, you should leave javassist.jar and common-softvaluehashmap.jar in place in this folder.
+
+*If installing in jboss 4.0.4 or later, the classes contained in javassist.jar and common-softvaluehashmap.jar will already be available,
+and you should do the following to avoid versioning conflicts:
+-delete common-softvaluehashmap.jar
+-move javassist.jar to ../../lib/javassist.jar
\ No newline at end of file
Property changes on: trunk/aspects/src/assembly/resources/ReadMe.txt
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: trunk/aspects/src/assembly/resources/base-aop.xml (from rev 94031, trunk/aspects/src/etc/base-aop.xml)
===================================================================
--- trunk/aspects/src/assembly/resources/base-aop.xml (rev 0)
+++ trunk/aspects/src/assembly/resources/base-aop.xml 2009-09-25 20:13:31 UTC (rev 94036)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <!-- 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="all(@org.jboss.aspects.security.Permissions)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.security.Unchecked)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.security.Exclude)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <introduction expr="class(@org.jboss.aspects.jmx.MBean)">
+ <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(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
+
+ <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="all(@org.jboss.aspects.tx.Tx)">
+ <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 *->@org.jboss.aspects.Current)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/>
+ </bind>
+
+ <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+ </bind>
+
+ <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+ <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+ </bind>
+
+ <!-- special types -->
+ <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/>
+ <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)">
+ <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/>
+ </bind>
+
+ <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/>
+ <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/>
+ </bind>
+
+</aop>
Property changes on: trunk/aspects/src/assembly/resources/base-aop.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: trunk/aspects/src/assembly/resources/org (from rev 94031, trunk/aspects/src/etc/org)
Property changes on: trunk/aspects/src/assembly/resources/org
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/aspects/src/etc/ReadMe.txt
===================================================================
--- trunk/aspects/src/etc/ReadMe.txt 2009-09-25 20:08:46 UTC (rev 94035)
+++ trunk/aspects/src/etc/ReadMe.txt 2009-09-25 20:13:31 UTC (rev 94036)
@@ -1,6 +0,0 @@
-* If installing in a version before JBoss 4.0.4, you should leave javassist.jar and common-softvaluehashmap.jar in place in this folder.
-
-*If installing in jboss 4.0.4 or later, the classes contained in javassist.jar and common-softvaluehashmap.jar will already be available,
-and you should do the following to avoid versioning conflicts:
--delete common-softvaluehashmap.jar
--move javassist.jar to ../../lib/javassist.jar
\ No newline at end of file
Deleted: trunk/aspects/src/etc/base-aop.xml
===================================================================
--- trunk/aspects/src/etc/base-aop.xml 2009-09-25 20:08:46 UTC (rev 94035)
+++ trunk/aspects/src/etc/base-aop.xml 2009-09-25 20:13:31 UTC (rev 94036)
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
- <!-- 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="all(@org.jboss.aspects.security.Permissions)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.security.Unchecked)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.security.Exclude)">
- <stack-ref name="J2EESecurityStack"/>
- </bind>
-
- <introduction expr="class(@org.jboss.aspects.jmx.MBean)">
- <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(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
-
- <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="all(@org.jboss.aspects.tx.Tx)">
- <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 *->@org.jboss.aspects.Current)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/>
- </bind>
-
- <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
- </bind>
-
- <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
- <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
- </bind>
-
- <!-- special types -->
- <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/>
- <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)">
- <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/>
- </bind>
-
- <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/>
- <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)">
- <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/>
- </bind>
-
-</aop>
Deleted: trunk/aspects/src/etc/default.mf
===================================================================
--- trunk/aspects/src/etc/default.mf 2009-09-25 20:08:46 UTC (rev 94035)
+++ trunk/aspects/src/etc/default.mf 2009-09-25 20:13:31 UTC (rev 94036)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @aspects.title@
-Specification-Version: @aspects.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @aspects.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @aspects.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
More information about the jboss-cvs-commits
mailing list