[jboss-cvs] JBossAS SVN: r78714 - in projects/aop/trunk: aop and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 19 18:09:27 EDT 2008
Author: pgier
Date: 2008-09-19 18:09:26 -0400 (Fri, 19 Sep 2008)
New Revision: 78714
Added:
projects/aop/trunk/aop/src/assembly/client-sources.xml
projects/aop/trunk/aop/src/assembly/client.xml
projects/aop/trunk/aop/src/assembly/single.xml
projects/aop/trunk/pluggable-instrumentor/
projects/aop/trunk/pluggable-instrumentor/pom.xml
projects/aop/trunk/pluggable-instrumentor/src/
projects/aop/trunk/pluggable-instrumentor/src/main/
projects/aop/trunk/pluggable-instrumentor/src/main/java/
projects/aop/trunk/pluggable-instrumentor/src/main/java/org/
projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/
projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/
projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/standalone/
projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/standalone/PluggableInstrumentor.java
projects/aop/trunk/pluggable-instrumentor/src/main/resources/
Removed:
projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml
projects/aop/trunk/aop/src/assembly/jdk50-client.xml
projects/aop/trunk/aop/src/assembly/jdk50-single.xml
projects/aop/trunk/aop/src/assembly/jdk50-sources.xml
projects/aop/trunk/aop/src/assembly/jdk50.xml
projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml
projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml
projects/aop/trunk/aop/src/etc/pluggable-instrumentor.mf
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration/build.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/pom.xml
projects/aop/trunk/tools/etc/buildmagic/modules.ent
Log:
[JBBUILD-491] Move pluggable-instrumentor to a separate module.
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/build.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -391,14 +391,13 @@
<fileset file="docs/jboss-aop_2_0.xsd"/>
<fileset file ="${source.etc}/jbossorg-eula.txt"/>
</jar>
- <jar jarfile="${build.lib}/pluggable-instrumentor.jar"
+ <!--<jar jarfile="${build.lib}/pluggable-instrumentor.jar"
manifest="${build.etc}/pluggable-instrumentor.mf">
<fileset dir="${build.classes}">
- <!-- Include everything else -->
<include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
</fileset>
<fileset file ="${source.etc}/jbossorg-eula.txt"/>
- </jar>
+ </jar>-->
<!-- Build the jboss-aop-jdk50-client.jar needed for EJB 3-->
<jar jarfile="${build.lib}/jboss-aop-jdk50-client.jar"
manifest="${build.etc}/default.mf">
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/pom.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
+ <artifactId>jboss-aop-jdk50</artifactId>
<packaging>jar</packaging>
<name>JBoss AOP Framework</name>
<description>JBoss AOP Framework</description>
@@ -35,6 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -79,29 +80,6 @@
<version>2.2-beta-2</version>
<executions>
<execution>
- <id>jdk50</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/jdk50.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
<id>jdk50-client</id>
<phase>package</phase>
<goals>
@@ -109,7 +87,7 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/jdk50-client.xml</descriptor>
+ <descriptor>src/assembly/client.xml</descriptor>
</descriptors>
<archive>
<manifest>
@@ -125,14 +103,14 @@
</configuration>
</execution>
<execution>
- <id>pluggable-instrumentor</id>
+ <id>client-sources</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/pluggable-instrumentor.xml</descriptor>
+ <descriptor>src/assembly/client-sources.xml</descriptor>
</descriptors>
<archive>
<manifest>
@@ -141,21 +119,19 @@
</manifest>
<manifestEntries>
<Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.PluggableInstrumentor</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
</manifestEntries>
</archive>
</configuration>
</execution>
<execution>
- <id>jdk50-single</id>
+ <id>single</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/jdk50-single.xml</descriptor>
+ <descriptor>src/assembly/single.xml</descriptor>
</descriptors>
<archive>
<manifest>
@@ -190,14 +166,16 @@
<copy todir="${basedir}/output/etc">
<fileset dir="${basedir}/src/etc"/>
</copy>
- <copy file="${project.build.directory}/jboss-aop-${project.version}-jdk50.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50.jar"/>
- <copy file="${project.build.directory}/jboss-aop-${project.version}-jdk50-client.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jdk50-sources.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-client.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar"/>
- <copy file="${project.build.directory}/jboss-aop-${project.version}-jdk50-single.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-client-sources.jar"
+ tofile="${basedir}/output/lib/jboss-aop-jdk50-client-sources.jar"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}-single.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar"/>
- <copy file="${project.build.directory}/jboss-aop-${project.version}-pluggable-instrumentor.jar"
- tofile="${basedir}/output/lib/pluggable-instrumentor.jar"/>
</tasks>
</configuration>
</execution>
@@ -293,57 +271,75 @@
</dependencies>
<profiles>
-
- <!-- The test profiles are currently not working until some maven issues are fixed.
- - For now the ant scripts can be used to run the tests.
- -->
<profile>
- <id>javaagent-genadvisor-tests</id>
+ <id>jrockit-build</id>
<activation>
<property>
- <name>all-tests</name>
+ <name>JROCKIT_HOME</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
- <id>javaagent-genadvisor-tests</id>
+ <id>jrockit-compile</id>
<goals>
- <goal>test</goal>
+ <goal>run</goal>
</goals>
+ <phase>compile</phase>
<configuration>
- <skip>false</skip>
- <includes>
- <include>org/jboss/test/aop/**/GenAdvisorOverrideTestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/aop/reflection/ReflectionAspectTester.java</exclude>
- <exclude>org/jboss/test/aop/basic/POJOAspectTester.java</exclude>
- </excludes>
- <argLine>-javaagent:target/jboss-aop-jdk50.jar</argLine>
- <systemProperties>
- <property>
- <name>jboss.aop.path</name>
- <value>src/resources/test/override/jboss-aop.xml</value>
- </property>
- <property>
- <name>jboss.aop.class.path</name>
- <value></value>
- </property>
- <property>
- <name>jboss.aop.instrumentor</name>
- <value>org.jboss.aop.instrument.GeneratedAdvisorInstrumentor</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>javaagent-genadvisor-tests</value>
- </property>
- </systemProperties>
+ <tasks>
+ <echo message="${JROCKIT_HOME}"/>
+ <!-- in older versions of jrockit the weaving stuff lives in managementapi.jar, in newer in management-agent.jar -->
+ <available file="${JROCKIT_HOME}/jre/lib/managementapi.jar" property="OLD_JROCKIT" value="managementapi.jar"/>
+ <available file="${JROCKIT_HOME}/jre/lib/management-agent.jar" property="NEW_JROCKIT" value="rt.jar"/>
+ <condition property="JROCKIT_API_AVAILABLE" value="${OLD_JROCKIT}">
+ <and>
+ <isset property="OLD_JROCKIT"/>
+ <not>
+ <isset property="NEW_JROCKIT"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="JROCKIT_API_AVAILABLE" value="${NEW_JROCKIT}">
+ <and>
+ <isset property="NEW_JROCKIT"/>
+ <not>
+ <isset property="OLD_JROCKIT"/>
+ </not>
+ </and>
+ </condition>
+ <path id="javac.jrockit.classpath">
+ <path refid="maven.compile.classpath"/>
+ <path path="${JROCKIT_HOME}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
+ </path>
+
+ <property name="build.compiler" value="extJavac"/>
+ <fail unless="JROCKIT_API_AVAILABLE">
+ JRockit API Not Available. Skipping JRockit compile.
+ </fail>
+ <javac destdir="${project.build.outputDirectory}"
+ target="1.4"
+ source="1.4">
+ <src path="${project.build.sourceDirectory}"/>
+ <include name="org/jboss/aop/hook/JRockit*"/>
+ <classpath refid="javac.jrockit.classpath"/>
+ </javac>
+ <mkdir dir="${basedir}/output"/>
+ <mkdir dir="${basedir}/output/lib"/>
+ <jar jarfile="${basedir}/output/lib/jrockit-pluggable-instrumentor.jar"
+ manifest="${basedir}/src/etc/default.mf">
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="org/jboss/aop/hook/JRockitPluggableClassPreProcessor.class"/>
+ <include name="org/jboss/aop/hook/JDK14*.class"/>
+ </fileset>
+ <fileset file ="${basedir}/src/etc/jbossorg-eula.txt"/>
+ </jar>
+ </tasks>
</configuration>
</execution>
</executions>
@@ -351,5 +347,7 @@
</plugins>
</build>
</profile>
+
</profiles>
+
</project>
Copied: projects/aop/trunk/aop/src/assembly/client-sources.xml (from rev 78713, projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml)
===================================================================
--- projects/aop/trunk/aop/src/assembly/client-sources.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/client-sources.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -0,0 +1,64 @@
+<assembly>
+ <id>client-sources</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/lang/**</include>
+ <include>org/jboss/aop/Advisor.java</include>
+ <include>org/jboss/aop/AspectManager.java</include>
+ <include>org/jboss/aop/AspectManager$*.java</include>
+ <include>org/jboss/aop/ClassAdvisor.java</include>
+ <include>org/jboss/aop/ClassInstanceAdvisor.java</include>
+ <include>org/jboss/aop/DynamicAOPStrategy.java</include>
+ <include>org/jboss/aop/InstanceAdvisorDelegate.java</include>
+ <include>org/jboss/aop/Domain.java</include>
+ <include>org/jboss/aop/InstanceAdvisor.java</include>
+ <include>org/jboss/aop/MethodInfo.java</include>
+ <include>org/jboss/aop/InterceptorChainObserver.java</include>
+ <include>org/jboss/aop/JoinPoint.java</include>
+ <include>org/jboss/aop/JoinPointInfo.java</include>
+ <include>org/jboss/aop/MethodJoinPoint.java</include>
+ <include>org/jboss/aop/*Dispatcher*.java</include>
+ <include>org/jboss/aop/*Advised.java</include>
+ <include>org/jboss/aop/WeavingStrategy.java</include>
+ <include>org/jboss/aop/advice/AspectDefinition.java</include>
+ <include>org/jboss/aop/advice/Interceptor.java</include>
+ <include>org/jboss/aop/instrument/Untransformable.java</include>
+ <include>org/jboss/aop/joinpoint/Invocation*.java</include>
+ <include>org/jboss/aop/joinpoint/Joinpoint.java</include>
+ <include>org/jboss/aop/joinpoint/JoinPointBean.java</include>
+ <include>org/jboss/aop/joinpoint/MethodExecution.java</include>
+ <include>org/jboss/aop/joinpoint/MethodInvocation*.java</include>
+ <include>org/jboss/aop/joinpoint/MethodJoinpoint.java</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData.java</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.java</include>
+ <include>org/jboss/aop/metadata/MetaDataResolver.java</include>
+ <include>org/jboss/aop/metadata/ThreadMetaData.java</include>
+ <include>org/jboss/aop/pointcut/PointcutStats.java</include>
+ <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.java</include>
+ <include>org/jboss/aop/proxy/MethodMapped.java</include>
+ <include>org/jboss/aop/proxy/Proxy.java</include>
+ <include>org/jboss/aop/proxy/ProxyFactory.java</include>
+ <include>org/jboss/aop/proxy/ProxyMixin.java</include>
+ <include>org/jboss/aop/proxy/container/*.java</include>
+ <include>org/jboss/aop/util/SecurityActions*.java</include>
+ <include>org/jboss/aop/util/Marshalled*.java</include>
+ <include>org/jboss/aop/util/MethodHashing*.java</include>
+ <include>org/jboss/aop/util/PayloadKey*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: projects/aop/trunk/aop/src/assembly/client.xml (from rev 78713, projects/aop/trunk/aop/src/assembly/jdk50-client.xml)
===================================================================
--- projects/aop/trunk/aop/src/assembly/client.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/client.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -0,0 +1,64 @@
+<assembly>
+ <id>client</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/jboss/lang/**</include>
+ <include>org/jboss/aop/Advisor.class</include>
+ <include>org/jboss/aop/AspectManager.class</include>
+ <include>org/jboss/aop/AspectManager$*.class</include>
+ <include>org/jboss/aop/ClassAdvisor.class</include>
+ <include>org/jboss/aop/ClassInstanceAdvisor.class</include>
+ <include>org/jboss/aop/DynamicAOPStrategy.class</include>
+ <include>org/jboss/aop/InstanceAdvisorDelegate.class</include>
+ <include>org/jboss/aop/Domain.class</include>
+ <include>org/jboss/aop/InstanceAdvisor.class</include>
+ <include>org/jboss/aop/MethodInfo.class</include>
+ <include>org/jboss/aop/InterceptorChainObserver.class</include>
+ <include>org/jboss/aop/JoinPoint.class</include>
+ <include>org/jboss/aop/JoinPointInfo.class</include>
+ <include>org/jboss/aop/MethodJoinPoint.class</include>
+ <include>org/jboss/aop/*Dispatcher*.class</include>
+ <include>org/jboss/aop/*Advised.class</include>
+ <include>org/jboss/aop/WeavingStrategy.class</include>
+ <include>org/jboss/aop/advice/AspectDefinition.class</include>
+ <include>org/jboss/aop/advice/Interceptor.class</include>
+ <include>org/jboss/aop/instrument/Untransformable.class</include>
+ <include>org/jboss/aop/joinpoint/Invocation*.class</include>
+ <include>org/jboss/aop/joinpoint/Joinpoint.class</include>
+ <include>org/jboss/aop/joinpoint/JoinPointBean.class</include>
+ <include>org/jboss/aop/joinpoint/MethodExecution.class</include>
+ <include>org/jboss/aop/joinpoint/MethodInvocation*.class</include>
+ <include>org/jboss/aop/joinpoint/MethodJoinpoint.class</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData.class</include>
+ <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class</include>
+ <include>org/jboss/aop/metadata/MetaDataResolver.class</include>
+ <include>org/jboss/aop/metadata/ThreadMetaData.class</include>
+ <include>org/jboss/aop/pointcut/PointcutStats.class</include>
+ <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.class</include>
+ <include>org/jboss/aop/proxy/MethodMapped.class</include>
+ <include>org/jboss/aop/proxy/Proxy.class</include>
+ <include>org/jboss/aop/proxy/ProxyFactory.class</include>
+ <include>org/jboss/aop/proxy/ProxyMixin.class</include>
+ <include>org/jboss/aop/proxy/container/*.class</include>
+ <include>org/jboss/aop/util/SecurityActions*.class</include>
+ <include>org/jboss/aop/util/Marshalled*.class</include>
+ <include>org/jboss/aop/util/MethodHashing*.class</include>
+ <include>org/jboss/aop/util/PayloadKey*.class</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/etc</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/jdk50-client-sources.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,64 +0,0 @@
-<assembly>
- <id>jdk50-client-sources</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/lang/**</include>
- <include>org/jboss/aop/Advisor.java</include>
- <include>org/jboss/aop/AspectManager.java</include>
- <include>org/jboss/aop/AspectManager$*.java</include>
- <include>org/jboss/aop/ClassAdvisor.java</include>
- <include>org/jboss/aop/ClassInstanceAdvisor.java</include>
- <include>org/jboss/aop/DynamicAOPStrategy.java</include>
- <include>org/jboss/aop/InstanceAdvisorDelegate.java</include>
- <include>org/jboss/aop/Domain.java</include>
- <include>org/jboss/aop/InstanceAdvisor.java</include>
- <include>org/jboss/aop/MethodInfo.java</include>
- <include>org/jboss/aop/InterceptorChainObserver.java</include>
- <include>org/jboss/aop/JoinPoint.java</include>
- <include>org/jboss/aop/JoinPointInfo.java</include>
- <include>org/jboss/aop/MethodJoinPoint.java</include>
- <include>org/jboss/aop/*Dispatcher*.java</include>
- <include>org/jboss/aop/*Advised.java</include>
- <include>org/jboss/aop/WeavingStrategy.java</include>
- <include>org/jboss/aop/advice/AspectDefinition.java</include>
- <include>org/jboss/aop/advice/Interceptor.java</include>
- <include>org/jboss/aop/instrument/Untransformable.java</include>
- <include>org/jboss/aop/joinpoint/Invocation*.java</include>
- <include>org/jboss/aop/joinpoint/Joinpoint.java</include>
- <include>org/jboss/aop/joinpoint/JoinPointBean.java</include>
- <include>org/jboss/aop/joinpoint/MethodExecution.java</include>
- <include>org/jboss/aop/joinpoint/MethodInvocation*.java</include>
- <include>org/jboss/aop/joinpoint/MethodJoinpoint.java</include>
- <include>org/jboss/aop/metadata/SimpleMetaData.java</include>
- <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.java</include>
- <include>org/jboss/aop/metadata/MetaDataResolver.java</include>
- <include>org/jboss/aop/metadata/ThreadMetaData.java</include>
- <include>org/jboss/aop/pointcut/PointcutStats.java</include>
- <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.java</include>
- <include>org/jboss/aop/proxy/MethodMapped.java</include>
- <include>org/jboss/aop/proxy/Proxy.java</include>
- <include>org/jboss/aop/proxy/ProxyFactory.java</include>
- <include>org/jboss/aop/proxy/ProxyMixin.java</include>
- <include>org/jboss/aop/proxy/container/*.java</include>
- <include>org/jboss/aop/util/SecurityActions*.java</include>
- <include>org/jboss/aop/util/Marshalled*.java</include>
- <include>org/jboss/aop/util/MethodHashing*.java</include>
- <include>org/jboss/aop/util/PayloadKey*.java</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/jdk50-client.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-client.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/jdk50-client.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,64 +0,0 @@
-<assembly>
- <id>jdk50-client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/lang/**</include>
- <include>org/jboss/aop/Advisor.class</include>
- <include>org/jboss/aop/AspectManager.class</include>
- <include>org/jboss/aop/AspectManager$*.class</include>
- <include>org/jboss/aop/ClassAdvisor.class</include>
- <include>org/jboss/aop/ClassInstanceAdvisor.class</include>
- <include>org/jboss/aop/DynamicAOPStrategy.class</include>
- <include>org/jboss/aop/InstanceAdvisorDelegate.class</include>
- <include>org/jboss/aop/Domain.class</include>
- <include>org/jboss/aop/InstanceAdvisor.class</include>
- <include>org/jboss/aop/MethodInfo.class</include>
- <include>org/jboss/aop/InterceptorChainObserver.class</include>
- <include>org/jboss/aop/JoinPoint.class</include>
- <include>org/jboss/aop/JoinPointInfo.class</include>
- <include>org/jboss/aop/MethodJoinPoint.class</include>
- <include>org/jboss/aop/*Dispatcher*.class</include>
- <include>org/jboss/aop/*Advised.class</include>
- <include>org/jboss/aop/WeavingStrategy.class</include>
- <include>org/jboss/aop/advice/AspectDefinition.class</include>
- <include>org/jboss/aop/advice/Interceptor.class</include>
- <include>org/jboss/aop/instrument/Untransformable.class</include>
- <include>org/jboss/aop/joinpoint/Invocation*.class</include>
- <include>org/jboss/aop/joinpoint/Joinpoint.class</include>
- <include>org/jboss/aop/joinpoint/JoinPointBean.class</include>
- <include>org/jboss/aop/joinpoint/MethodExecution.class</include>
- <include>org/jboss/aop/joinpoint/MethodInvocation*.class</include>
- <include>org/jboss/aop/joinpoint/MethodJoinpoint.class</include>
- <include>org/jboss/aop/metadata/SimpleMetaData.class</include>
- <include>org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class</include>
- <include>org/jboss/aop/metadata/MetaDataResolver.class</include>
- <include>org/jboss/aop/metadata/ThreadMetaData.class</include>
- <include>org/jboss/aop/pointcut/PointcutStats.class</include>
- <include>org/jboss/aop/proxy/MarshalledInterfaceProxy.class</include>
- <include>org/jboss/aop/proxy/MethodMapped.class</include>
- <include>org/jboss/aop/proxy/Proxy.class</include>
- <include>org/jboss/aop/proxy/ProxyFactory.class</include>
- <include>org/jboss/aop/proxy/ProxyMixin.class</include>
- <include>org/jboss/aop/proxy/container/*.class</include>
- <include>org/jboss/aop/util/SecurityActions*.class</include>
- <include>org/jboss/aop/util/Marshalled*.class</include>
- <include>org/jboss/aop/util/MethodHashing*.class</include>
- <include>org/jboss/aop/util/PayloadKey*.class</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/jdk50-single.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-single.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/jdk50-single.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,32 +0,0 @@
-<assembly>
- <id>jdk50-single</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.jboss.aop:jboss-aop</include>
- <include>javassist:javassist</include>
- <include>org.jboss:jboss-common-core</include>
- <include>org.jboss:jboss-reflect</include>
- <include>org.jboss:jboss-mdr</include>
- <include>org.jboss.logging:jboss-logging-log4j</include>
- <include>org.jboss.logging:jboss-logging-spi</include>
- <include>log4j:log4j</include>
- <include>trove:trove</include>
- </includes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>docs/jboss-aop_1_0.dtd</include>
- <include>src/etc/jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/jdk50-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/jdk50-sources.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,23 +0,0 @@
-<assembly>
- <id>pluggable-instrumentor</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>org/jboss/aop/standalone/PluggableInstrumentor.java</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/jdk50.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/jdk50.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/jdk50.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,23 +0,0 @@
-<assembly>
- <id>jdk50</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>org/jboss/aop/standalone/PluggableInstrumentor.class</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/pluggable-instrumentor-sources.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,23 +0,0 @@
-<assembly>
- <id>pluggable-instrumentor-sources</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/aop/standalone/PluggableInstrumentor.java</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml
===================================================================
--- projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/assembly/pluggable-instrumentor.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,23 +0,0 @@
-<assembly>
- <id>pluggable-instrumentor</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org/jboss/aop/standalone/PluggableInstrumentor.class</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/etc</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Copied: projects/aop/trunk/aop/src/assembly/single.xml (from rev 78713, projects/aop/trunk/aop/src/assembly/jdk50-single.xml)
===================================================================
--- projects/aop/trunk/aop/src/assembly/single.xml (rev 0)
+++ projects/aop/trunk/aop/src/assembly/single.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -0,0 +1,32 @@
+<assembly>
+ <id>single</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.aop:jboss-aop</include>
+ <include>javassist:javassist</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss.logging:jboss-logging-log4j</include>
+ <include>org.jboss.logging:jboss-logging-spi</include>
+ <include>log4j:log4j</include>
+ <include>trove:trove</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>docs/jboss-aop_1_0.dtd</include>
+ <include>src/etc/jbossorg-eula.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/etc/pluggable-instrumentor.mf
===================================================================
--- projects/aop/trunk/aop/src/etc/pluggable-instrumentor.mf 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/etc/pluggable-instrumentor.mf 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @aop.title@
-Specification-Version: @aop.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @aop.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @aop.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
-Premain-Class: org.jboss.aop.standalone.PluggableInstrumentor
-Can-Redefine-Classes: true
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java 2008-09-19 22:09:26 UTC (rev 78714)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., 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.
- */
-package org.jboss.aop.standalone;
-
-import java.lang.instrument.Instrumentation;
-
-/**
- * Expose the Instrumentation interface to JVM.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 37406 $
- */
-public class PluggableInstrumentor
-{
- private static Instrumentation instrumentor;
-
- public static Instrumentation getInstrumentor()
- {
- return instrumentor;
- }
-
- public static void premain(String agentArgs, Instrumentation inst)
- {
- instrumentor = inst;
- }
-}
Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/asintegration/build.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -80,7 +80,8 @@
<!-- Configure modules -->
<path id="dependentmodule.classpath">
- <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.pluggable.instrumentor.classpath"/>
</path>
<!-- ===== -->
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/build/build.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -277,6 +277,7 @@
<!-- Define a macro for calling maven -->
<macrodef name="maven">
+ <attribute name="options"/>
<attribute name="goal" />
<attribute name="basedir" />
<element name="args" implicit="true" optional="true" />
@@ -297,7 +298,7 @@
</classpath>
<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
<sysproperty key="maven.home" value="${maven.dir}" />
- <arg line="--batch-mode -Pant-integration-build ${thirdparty.maven.opts} @{goal}" />
+ <arg line="--batch-mode -Pant-integration-build @{options} @{goal}" />
</java>
</sequential>
</macrodef>
@@ -311,7 +312,7 @@
<property name="maven.dir" value="${basedir}/../tools/maven"/>
<property name="thirdparty.maven.opts" value=""/>
- <maven basedir="${basedir}/../thirdparty" goal="generate-resources"/>
+ <maven basedir="${basedir}/../thirdparty" options="${thirdparty.maven.opts}" goal="generate-resources"/>
<fail message="Unable to build thirdparty directory. See maven output for details.">
<condition>
@@ -327,9 +328,9 @@
<target name="maven-build-install" depends="createthirdparty">
<property name="maven.dir" value="${basedir}/../tools/maven"/>
- <property name="thirdparty.maven.opts" value=""/>
+ <property name="build.maven.opts" value=""/>
- <maven basedir="${basedir}/../" goal="install"/>
+ <maven basedir="${basedir}/../" options="${build.maven.opts}" goal="install"/>
<fail message="Unable to build maven modules. See maven output for details.">
<condition>
@@ -345,9 +346,9 @@
<target name="maven-build-clean" depends="createthirdparty">
<property name="maven.dir" value="${basedir}/../tools/maven"/>
- <property name="thirdparty.maven.opts" value=""/>
+ <property name="build.maven.opts" value=""/>
- <maven basedir="${basedir}/../" goal="clean"/>
+ <maven basedir="${basedir}/../" options="${build.maven.opts}" goal="clean"/>
<fail message="Unable to clean maven modules. See maven output for details.">
<condition>
Property changes on: projects/aop/trunk/pluggable-instrumentor
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/aop/trunk/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/trunk/pluggable-instrumentor/pom.xml (rev 0)
+++ projects/aop/trunk/pluggable-instrumentor/pom.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -0,0 +1,39 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>pluggable-instrumentor</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>JBoss AOP Pluggable Instrumentor</name>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${pom.url}</Implementation-URL>
+ <Premain-Class>org.jboss.aop.standalone.PluggableInstrumentor</Premain-Class>
+ <Can-Redefine-Classes>true</Can-Redefine-Classes>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: projects/aop/trunk/pluggable-instrumentor/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Copied: projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/standalone/PluggableInstrumentor.java (from rev 78712, projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/PluggableInstrumentor.java)
===================================================================
--- projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/standalone/PluggableInstrumentor.java (rev 0)
+++ projects/aop/trunk/pluggable-instrumentor/src/main/java/org/jboss/aop/standalone/PluggableInstrumentor.java 2008-09-19 22:09:26 UTC (rev 78714)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., 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.
+ */
+package org.jboss.aop.standalone;
+
+import java.lang.instrument.Instrumentation;
+
+/**
+ * Expose the Instrumentation interface to JVM.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 37406 $
+ */
+public class PluggableInstrumentor
+{
+ private static Instrumentation instrumentor;
+
+ public static Instrumentation getInstrumentor()
+ {
+ return instrumentor;
+ }
+
+ public static void premain(String agentArgs, Instrumentation inst)
+ {
+ instrumentor = inst;
+ }
+}
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/pom.xml 2008-09-19 22:09:26 UTC (rev 78714)
@@ -511,6 +511,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>pluggable-instrumentor</module>
<module>aop</module>
<module>aspects</module>
<module>asintegration</module>
@@ -519,6 +520,7 @@
<profile>
<id>ant-integration-build</id>
<modules>
+ <module>pluggable-instrumentor</module>
<module>aop</module>
</modules>
</profile>
Modified: projects/aop/trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- projects/aop/trunk/tools/etc/buildmagic/modules.ent 2008-09-19 18:01:32 UTC (rev 78713)
+++ projects/aop/trunk/tools/etc/buildmagic/modules.ent 2008-09-19 22:09:26 UTC (rev 78714)
@@ -8,5 +8,9 @@
</path>
<path id="jboss.aop.classpath">
<pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
- <pathelement path="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
</path>
+<!-- Pluggable Instrumentor -->
+<property name="jboss.pluggable.instrumentor.lib" value="${project.root}/pluggable-instrumentor/target"/>
+<path id="jboss.pluggable.instrumentor.classpath">
+ <pathelement path="${jboss.pluggable.instrumentor.lib}/pluggable-instrumentor.jar"/>
+</path>
More information about the jboss-cvs-commits
mailing list