[jboss-cvs] JBossAS SVN: r63417 - in projects/aop/trunk/aspects: src and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 8 05:14:12 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-06-08 05:14:11 -0400 (Fri, 08 Jun 2007)
New Revision: 63417
Removed:
projects/aop/trunk/aspects/src/etc/ReadMe.txt
projects/aop/trunk/aspects/src/etc/base-aop.xml
projects/aop/trunk/aspects/src/etc/org/
projects/aop/trunk/aspects/src/test50/
Modified:
projects/aop/trunk/aspects/.classpath
projects/aop/trunk/aspects/build.xml
Log:
Get rid of stuff that does not live in standalone aspect library
Modified: projects/aop/trunk/aspects/.classpath
===================================================================
--- projects/aop/trunk/aspects/.classpath 2007-06-08 09:08:49 UTC (rev 63416)
+++ projects/aop/trunk/aspects/.classpath 2007-06-08 09:14:11 UTC (rev 63417)
@@ -5,36 +5,19 @@
<classpathentry excluding="org/jboss/test/aop/test/AOPTestSetup.java|org/jboss/test/asynch/" kind="src" path="src/test"/>
<classpathentry kind="src" path="src/test50"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar" sourcepath="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar"/>
- <classpathentry kind="src" path="/cluster"/>
- <classpathentry kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar" sourcepath="/thirdparty/apache-log4j/lib/log4j-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh-1.3.0.jar"/>
- <classpathentry kind="src" path="/j2se"/>
- <classpathentry kind="src" path="/jmx"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/naming"/>
- <classpathentry combineaccessrules="false" kind="src" path="/connector"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar" sourcepath="/thirdparty/apache-xerces/lib/xercesImpl-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/aop"/>
+ <classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/>
+ <classpathentry kind="lib" path="concurrent.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: projects/aop/trunk/aspects/build.xml
===================================================================
--- projects/aop/trunk/aspects/build.xml 2007-06-08 09:08:49 UTC (rev 63416)
+++ projects/aop/trunk/aspects/build.xml 2007-06-08 09:14:11 UTC (rev 63417)
@@ -17,7 +17,7 @@
<!--| Buildmagic extentions. |-->
<!--+======================================================================+-->
-<project default="main" name="JBoss/Aspects">
+<project default="main" name="JBoss/Standalone Aspects">
<!--+====================================================================+-->
<!--| Setup |-->
@@ -73,7 +73,7 @@
<path refid="beanshell.beanshell.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.test.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
+ <!--path refid="jboss.microcontainer.classpath"/-->
</path>
<!-- Configure modules -->
@@ -99,13 +99,13 @@
<property name="build.reports" value="${module.output}/reports"/>
<property name="build.gen-src" value="${module.output}/gen-src"/>
<property name="build.classes" value="${module.output}/classes"/>
+ <property name="build.classes.retro" value="${module.output}/classes-retro"/>
<property name="build.resources" value="${module.output}/resources"/>
<property name="build.lib" value="${module.output}/lib"/>
<property name="build.unpacked" value="${module.output}/unpacked"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
<property name="build.todo" value="${module.output}/todo"/>
- <property name="build.meta.inf" value="${module.output}/META-INF"/>
<!-- Install/Release structure -->
<property name="install.id" value="${module.name}-${module.version}"/>
@@ -136,6 +136,13 @@
<path refid="javac.classpath"/>
</path>
+ <path id="jbossretro.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ </path>
+
<!-- xdoclet -->
<path id="xdoclet.task.classpath">
<path refid="javac.classpath"/>
@@ -159,7 +166,7 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-etc, _default:compile-resources, compile-classes">
+ depends="_default:compile-etc, _default:compile-resources, compile-classes, retrotranslate">
<!-- Add module specific elements here. -->
</target>
@@ -183,7 +190,22 @@
<classpath refid="javac.classpath"/>
</javac>
</target>
+
+ <target name="retrotranslate" depends="compile-classes">
+ <mkdir dir="${build.classes.retro}"/>
+ <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+ <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
+ <classpath refid="jbossretro.classpath"/>
+ <classpath refid="javac15.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
+
<!--+====================================================================+-->
<!--| Generate Output |-->
<!--| |-->
@@ -201,56 +223,23 @@
<mkdir dir="${build.lib}"/>
- <!-- Build jboss-aspect-deployer-jdk50.jar -->
- <jar destfile="${build.lib}/jboss-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
+ <!-- Build jboss-standalone-aspect-library-jdk50.jar -->
+ <jar destfile="${build.lib}/jboss-standalone-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
- <!--include name="org/jboss/aop/deployers/JBossAspectLibrary.class"/-->
- <include name="org/jboss/aop/junit/**"/>
+ <include name="org/jboss/aop/junit/**"/>
<include name="org/jboss/aspects/**"/>
</fileset>
- <fileset dir="${build.etc}">
- <include name="org/jboss/**/*.xml"/>
- </fileset>
</jar>
- <!-- Build client jar containing the minimum needed for ejb 3 -->
- <jar destfile="${build.lib}/jboss-aspect-jdk50-client.jar" manifest="${build.etc}/default.mf"
+ <!-- Build jboss-standalone-aspect-library-jdk14.jar -->
+ <jar destfile="${build.lib}/jboss-standalone-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/aspects/asynch/AsynchExecutor.class"/>
- <include name="org/jboss/aspects/asynch/AsynchProvider.class"/>
- <include name="org/jboss/aspects/asynch/AsynchProxyInterceptor.class"/>
- <include name="org/jboss/aspects/asynch/AsynchMixin.class"/>
- <include name="org/jboss/aspects/asynch/Future.class"/>
- <include name="org/jboss/aspects/asynch/FutureImpl.class"/>
- <include name="org/jboss/aspects/asynch/FutureHolder.class"/>
- <include name="org/jboss/aspects/asynch/FutureInvocationHandler.class"/>
- <include name="org/jboss/aspects/asynch/RemotableFuture.class"/>
- <include name="org/jboss/aspects/asynch/TimeoutException.class"/>
- <include name="org/jboss/aspects/asynch/ThreadPoolExecutor*.class"/>
- <include name="org/jboss/aspects/remoting/ClusterConstants.class"/>
- <include name="org/jboss/aspects/remoting/ClusterChooserInterceptor.class"/>
- <include name="org/jboss/aspects/remoting/FamilyWrapper.class"/>
- <include name="org/jboss/aspects/remoting/InvokeRemoteInterceptor.class"/>
- <include name="org/jboss/aspects/remoting/IsLocalInterceptor.class"/>
- <include name="org/jboss/aspects/remoting/MergeMetaDataInterceptor.class"/>
- <include name="org/jboss/aspects/remoting/PojiProxy.class"/>
- <include name="org/jboss/aspects/tx/ClientTxPropagationInterceptor.class"/>
- <include name="org/jboss/aspects/security/SecurityClientInterceptor.class"/>
- <include name="org/jboss/aspects/security/SecurityActions*.class"/>
+ <include name="org/jboss/aop/junit/**"/>
+ <include name="org/jboss/aspects/**"/>
</fileset>
</jar>
-
- <copy file="${project.root}/aspects/src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
-
- <jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
- update="${jar.update}" index="${jar.index}">
- <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
- <fileset file="${build.meta.inf}/base-aspects.xml"/>
- </jar>
- <delete dir="${build.meta.inf}"/>
</target>
Deleted: projects/aop/trunk/aspects/src/etc/ReadMe.txt
===================================================================
--- projects/aop/trunk/aspects/src/etc/ReadMe.txt 2007-06-08 09:08:49 UTC (rev 63416)
+++ projects/aop/trunk/aspects/src/etc/ReadMe.txt 2007-06-08 09:14:11 UTC (rev 63417)
@@ -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: projects/aop/trunk/aspects/src/etc/base-aop.xml
===================================================================
--- projects/aop/trunk/aspects/src/etc/base-aop.xml 2007-06-08 09:08:49 UTC (rev 63416)
+++ projects/aop/trunk/aspects/src/etc/base-aop.xml 2007-06-08 09:14:11 UTC (rev 63417)
@@ -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>
More information about the jboss-cvs-commits
mailing list