[jboss-cvs] JBossAS SVN: r71187 - in projects/aop/branches/joinpoint_graph: build/build_for_dist and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 23 23:56:27 EDT 2008
Author: flavia.rainone at jboss.com
Date: 2008-03-23 23:56:27 -0400 (Sun, 23 Mar 2008)
New Revision: 71187
Added:
projects/aop/branches/joinpoint_graph/build/build_for_dist/
projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml
projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java
Removed:
projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml
Modified:
projects/aop/branches/joinpoint_graph/build/RELEASE_NOTES.html
projects/aop/branches/joinpoint_graph/build/build-release.xml
projects/aop/branches/joinpoint_graph/build/build-thirdparty.xml
projects/aop/branches/joinpoint_graph/build/build.xml
projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/pom.xml
projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
projects/aop/branches/joinpoint_graph/tools/etc/buildmagic/buildmagic.ent
Log:
Merging trunk changes.
Modified: projects/aop/branches/joinpoint_graph/build/RELEASE_NOTES.html
===================================================================
--- projects/aop/branches/joinpoint_graph/build/RELEASE_NOTES.html 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/build/RELEASE_NOTES.html 2008-03-24 03:56:27 UTC (rev 71187)
@@ -1,13 +1,105 @@
<html>
<head>
-<title>Release Notes - JBoss AOP - Version 2.0.0.CR2</title>
+<title>Release Notes - JBoss AOP - Version 2.0.0.CR3</title>
</head>
<body>
-<h2>Release Notes - JBoss AOP - Version 2.0.0.CR2</h2>
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR8</h2>
<h3>Bug</h3>
<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-492'>JBAOP-492</a>] - Duplicate _getAdvisor</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-495'>JBAOP-495</a>] - run-precompiled refers wrong jar</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-496'>JBAOP-496</a>] - run-precompiled.bat never runs the class</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-499'>JBAOP-499</a>] - Deadlock on multi-threaded dynamic AOP scenarios</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-517'>JBAOP-517</a>] - Enable Advisor.methodInterceptors field</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-528'>JBAOP-528</a>] - Fix bug when double-weaving existing javaassist proxies</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-534'>JBAOP-534</a>] - JBoss AOP ignore classes packaged in org.jboss.aop, it should be org.jboss.aop.</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-536'>JBAOP-536</a>] - Generated invokeNext method should be synchronized</li>
+</ul>
+
+<h3>Feature Request</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-516'>JBAOP-516</a>] - Support exclude=* in order to just include some package in current project</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-520'>JBAOP-520</a>] - maven-jbossaop-plugin to run java with aop options</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-526'>JBAOP-526</a>] - Use MetaData.isMetaDataPresent() instead of MetaData.isAnnotationPresent()</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-529'>JBAOP-529</a>] - Document maven plugin and add pom.xml for most of the examples in the dist</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-532'>JBAOP-532</a>] - Increase performance of annotation parsing by making checking of RuntimeInvisible annotations optional</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-541'>JBAOP-541</a>] - Use simple synchronization rather than rw locks when initialising lazy collections</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-543'>JBAOP-543</a>] - Replace exception when undeploying non-existant domain with a log warning</li>
+</ul>
+
+<h3>Task</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-530'>JBAOP-530</a>] - Missing classes in AOP-client JAR</li>
+</ul>
+
+<h3>Thirdparty Change</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-533'>JBAOP-533</a>] - Upgrade javassist to 3.7.1.GA</li>
+</ul>
+
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR7</h2>
+
+<h3>Feature Request</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-524'>JBAOP-524</a>] - Annotation processing is slow</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-525'>JBAOP-525</a>] - Should be possible to serialize a ContainerProxyCacheKey containing (unserializable) MetaData</li>
+</ul>
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR6</h2>
+
+<h3>Bug</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-523'>JBAOP-523</a>] - NPE trying to read annotations when shutting down server</li>
+</ul>
+
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR5</h2>
+
+<h3>Feature Request</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-522'>JBAOP-522</a>] - Pass in full VFSDeploymentUnit from AspectDeployer to DomainInitialiser</li>
+</ul>
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR4</h2>
+
+<h3>Bug</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-453'>JBAOP-453</a>] - maven-jbossaop-plugin requires artifact maven-jbossaop-plugin on compile classpath</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-514'>JBAOP-514</a>] - AbstractAspectManager.destroy() should be calling undeployXml() instead of deployXml()</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-518'>JBAOP-518</a>] - Post condition of InstanceAdvisorDelegate.initializeAspects is not aspect != null</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-519'>JBAOP-519</a>] - Duplicate methods in ContainerProxyFactory</li>
+</ul>
+
+<h3>Feature Request</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-467'>JBAOP-467</a>] - Serialize container proxies out of vm</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-513'>JBAOP-513</a>] - Delete the unused GeneratedAdvisedInterface</li>
+</ul>
+
+<h3>Task</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-290'>JBAOP-290</a>] - Make src/build.xml work</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-511'>JBAOP-511</a>] - Add root dir to release file</li>
+</ul>
+
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR3</h2>
+
+<h3>Bug</h3>
+<ul>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-200'>JBAOP-200</a>] - Make sure the batch and sh files work</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-497'>JBAOP-497</a>] - ClassNotFoundException on JBoss 5</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-505'>JBAOP-505</a>] - Parameter Matching Backtrack can break indexes</li>
+<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-507'>JBAOP-507</a>] - Launcher classloader is not accepted as a valid classloader in jboss embedded</li>
+</ul>
+
+<h2>Release Notes - JBoss AOP - Version 2.0.0.CR2</h2>
+
+<h3>Bug</h3>
+<ul>
<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-380'>JBAOP-380</a>] - JBoss AOP sets info field to null before rebuilding a chain</li>
<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-480'>JBAOP-480</a>] - NPE in concurrent join point generation</li>
<li>[<a href='http://jira.jboss.com/jira/browse/JBAOP-493'>JBAOP-493</a>] - Instrumentor.isBaseClass does not examine the whole hierarchy</li>
Modified: projects/aop/branches/joinpoint_graph/build/build-release.xml
===================================================================
--- projects/aop/branches/joinpoint_graph/build/build-release.xml 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/build/build-release.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -13,6 +13,34 @@
<!-- Add the files from 'aop' -->
<!-- ================================================== -->
+ <!-- build.xml that will compile src/tests and run tests from the dist package -->
+ <copy todir="${project.release}" filtering="no">
+ <fileset dir="${project.root}/build/build_for_dist">
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${project.release}/etc" filtering="no">
+ <fileset dir="${project.root}/aop/src/etc">
+ <include name="default.mf"/>
+ <include name="jbossorg-eula.txt"/>
+ <include name="pluggable-instrumentor.mf"/>
+ </fileset>
+ </copy>
+
+ <!-- needed to build the source/tests from the dist package -->
+ <copy todir="${project.release}/lib-test" filtering="no">
+ <fileset dir="${project.root}/thirdparty/jboss/test/lib">
+ <include name="jboss-test.jar"/>
+ </fileset>
+ <fileset dir="${project.root}/thirdparty/junit/lib">
+ <include name="junit.jar"/>
+ </fileset>
+ <fileset dir="${project.root}/thirdparty/jboss/profiler/jvmti/lib">
+ <include name="jboss-profiler-jvmti.jar"/>
+ </fileset>
+ </copy>
+
<copy todir="${project.release}/bin" filtering="no">
<fileset dir="${project.root}/aop/src/resources/bin">
<include name="**/*"/>
@@ -35,6 +63,7 @@
</fileset>
</copy>
+
<copy todir="${project.release}/src/aspect-framework" filtering="no">
<fileset dir="${project.root}/aop/src">
<include name="main/**/*.java"/>
@@ -268,4 +297,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Modified: projects/aop/branches/joinpoint_graph/build/build-thirdparty.xml
===================================================================
--- projects/aop/branches/joinpoint_graph/build/build-thirdparty.xml 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/build/build-thirdparty.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -46,7 +46,7 @@
<componentref name="apache-log4j" version="1.2.14-brew"/>
<componentref name="dom4j" version="1.6.1jboss"/>
<componentref name="beanshell" version="1.3.0"/>
- <componentref name="javassist" version="3.6.0.GA"/>
+ <componentref name="javassist" version="3.7.1.GA"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/common-core" version="2.2.3.GA"/>
<componentref name="jboss/common-core-14" version="2.2.1.GA"/>
@@ -55,7 +55,7 @@
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/jboss-retro" version="1.1.2"/>
<componentref name="jboss/integration" version="5.0.0.Beta4"/>
- <componentref name="jboss/microcontainer" version="2.0.0.Beta9"/>
+ <componentref name="jboss/microcontainer" version="2.0.0.Beta10"/>
<componentref name="jboss/microcontainer14" version="2.0.0.Beta4"/>
<componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
<componentref name="jboss/test" version="1.0.3.GA"/>
Modified: projects/aop/branches/joinpoint_graph/build/build.xml
===================================================================
--- projects/aop/branches/joinpoint_graph/build/build.xml 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/build/build.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -221,7 +221,9 @@
<ant antfile="build-release.xml" target="release-reference-docs"/>
<zip destfile="${project.release}.zip">
- <fileset dir="${project.release}"/>
+ <fileset dir="${project.output}">
+ <include name="${aop.version}/**"/>
+ </fileset>
</zip>
<move file="${project.release}.zip" todir="${module.output}/lib"/>
</target>
@@ -232,7 +234,7 @@
<ant antfile="build-release.xml" target="release-no-reference-docs"/>
<ant antfile="build-release.xml" target="release-reference-docs"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Source Archives -->
<!-- ================================================================== -->
Copied: projects/aop/branches/joinpoint_graph/build/build_for_dist (from rev 71182, projects/aop/trunk/build/build_for_dist)
Deleted: projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml
===================================================================
--- projects/aop/trunk/build/build_for_dist/build.xml 2008-03-24 01:24:49 UTC (rev 71182)
+++ projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="main" name="JBoss/AOP">
-
-
- <target name="init">
-
- <property name="java.optimize" value="true"/>
- <property name="java.debug" value="false"/>
-
- <property name="source" value="src/aspect-framework/"/>
- <property name="source.java" value="${source}/main"/>
- <property name="source.tests.java" value="${source}/test"/>
- <property name="source.res" value="${source}/resources"/>
- <property name="source.etc" value="${source}/etc"/>
-
- <!-- Where build generated files will go -->
- <property name="output" value="output"/>
- <property name="build.reports" value="${output}/reports"/>
- <property name="build.stylesheets" value="${output}/stylesheets"/>
- <property name="build.classes" value="${output}/classes"/>
- <property name="build.classes.retro" value="${output}/classes-retro"/>
- <property name="build.tests.classes" value="${output}/tests.classes"/>
- <property name="build.lib" value="${output}/lib"/>
- <property name="build.api" value="${output}/javadoc"/>
- <property name="build.etc" value="etc"/>
- <property name="build.gen-src" value="${output}/gen-src"/>
- <property name="build.gen" value="${output}/gen"/>
- <property name="build.bootclasspath" value="${output}/gen-bootclasspath"/>
-
-
-
- <path id="javassist.classpath">
- <pathelement path="lib-50/javassist.jar"/>
- </path>
-
- <path id="trove.classpath">
- <pathelement path="lib-50/trove.jar"/>
- </path>
-
- <path id="apache.log4j.classpath">
- <pathelement path="lib-50/log4j.jar"/>
- </path>
-
- <path id="qdox.classpath">
- <pathelement path="lib-14/qdox.jar"/> <!-- needs to be added -->
- </path>
-
- <path id="jboss.core.classpath">
- <pathelement path="lib-50/jboss-common-core.jar"/>
- </path>
-
- <path id="jboss.container.classpath">
- <pathelement path="lib-50/jboss-container.jar"/>
- </path>
-
- <path id="jboss.logging.log4j.classpath">
- <pathelement path="lib-50/jboss-logging-log4j.jar"/>
- </path>
-
- <path id="jboss.logging.classpath">
- <pathelement path="lib-50/jboss-logging-spi.jar"/>
- </path>
-
- <path id="library.classpath">
- <path refid="apache.log4j.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="qdox.classpath"/>
- <path refid="jboss.core.classpath"/>
- <path refid="jboss.container.classpath"/>
- <path refid="jboss.logging.log4j.classpath"/>
- <path refid="jboss.logging.classpath"/>
- <!--
- <path refid="qdox.classpath"/>
- <path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss/common.core.classpath"/>
- <path refid="jboss/common.logging.log4j.classpath"/>
- <path refid="jboss/common.logging.jdk.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.test.classpath"/>
- -->
- </path>
-
- <path id="test.classpath">
- <path refid="library.classpath"/>
- <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="lib-test/jboss-test.jar"/> <!-- needs to be added -->
- <pathelement path="lib-test/junit.jar"/> <!-- needs to be added -->
- <pathelement path="lib-test/jboss-profiler-jvmti.jar"/> <!-- needs to be added -->
- </path>
-
- </target>
-
- <target name="main" depends="compile-classes">
-
-
- </target>
-
-
- <target name="compile-classes" depends="init">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="1.5"
- source="1.5"
- debug= "${javac.debug}">
- <src path="${source.java}"/>
- <exclude name="org/jboss/aop/definition/**"/>
- <exclude name="org/jboss/aop/hook/JRockit*"/>
- <classpath refid="library.classpath"/>
- </javac>
- </target>
-
-
- <target name="compile-test-classes" depends="jars15">
- <mkdir dir="${build.tests.classes}"/>
- <javac destdir="${build.tests.classes}"
- optimize="${javac.optimize}"
- target="1.5"
- source="1.5"
- debug="${javac.debug}">
- <src path="${source.tests.java}"/>
- <classpath refid="test.classpath"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
-
-
- <target name="jars15" description="Builds all jar files." depends="compile-classes">
-
- <mkdir dir="${build.lib}"/>
-
- <!-- Build the jboss-aop-jdk50.jar -->
- <jar jarfile="${build.lib}/jboss-aop-jdk50.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file="docs/jboss-aop_1_0.dtd"/>
- <fileset file ="${build.etc}/jbossorg-eula.txt"/>
- </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 ="${build.etc}/jbossorg-eula.txt"/>
- </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">
- <fileset dir="${build.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/lang/**"/>
- <include name="org/jboss/aop/Advisor.class"/>
- <include name="org/jboss/aop/AspectManager.class"/>
- <include name="org/jboss/aop/AspectManager$*.class"/>
- <include name="org/jboss/aop/ClassAdvisor.class"/>
- <include name="org/jboss/aop/ClassInstanceAdvisor.class"/>
- <include name="org/jboss/aop/InstanceAdvisorDelegate.class"/>
- <include name="org/jboss/aop/Domain.class"/>
- <include name="org/jboss/aop/InstanceAdvisor.class"/>
- <include name="org/jboss/aop/MethodInfo.class"/>
- <include name="org/jboss/aop/InterceptorChainObserver.class"/>
- <include name="org/jboss/aop/JoinPoint.class"/>
- <include name="org/jboss/aop/JoinPointInfo.class"/>
- <include name="org/jboss/aop/MethodJoinPoint.class"/>
- <include name="org/jboss/aop/*Dispatcher*.class"/>
- <include name="org/jboss/aop/*Advised.class"/>
- <include name="org/jboss/aop/advice/AspectDefinition.class"/>
- <include name="org/jboss/aop/advice/Interceptor.class"/>
- <include name="org/jboss/aop/instrument/Untransformable.class"/>
- <include name="org/jboss/aop/joinpoint/Invocation*.class"/>
- <include name="org/jboss/aop/joinpoint/Joinpoint.class"/>
- <include name="org/jboss/aop/joinpoint/JoinPointBean.class"/>
- <include name="org/jboss/aop/joinpoint/MethodExecution.class"/>
- <include name="org/jboss/aop/joinpoint/MethodInvocation*.class"/>
- <include name="org/jboss/aop/joinpoint/MethodJoinpoint.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class"/>
- <include name="org/jboss/aop/metadata/MetaDataResolver.class"/>
- <include name="org/jboss/aop/metadata/ThreadMetaData.class"/>
- <include name="org/jboss/aop/proxy/MarshalledInterfaceProxy.class"/>
- <include name="org/jboss/aop/proxy/MethodMapped.class"/>
- <include name="org/jboss/aop/proxy/Proxy.class"/>
- <include name="org/jboss/aop/proxy/ProxyFactory.class"/>
- <include name="org/jboss/aop/proxy/ProxyMixin.class"/>
- <include name="org/jboss/aop/util/SecurityActions*.class"/>
- <include name="org/jboss/aop/util/Marshalled*.class"/>
- <include name="org/jboss/aop/util/MethodHashing*.class"/>
- <include name="org/jboss/aop/util/PayloadKey*.class"/>
- </fileset>
- <fileset file ="${build.etc}/jbossorg-eula.txt"/>
- </jar>
- </target>
-
-
- <target name="javadoc" depends="init">
- <javadoc sourcepath="${source.java}"
- packagenames="org.jboss.*"
- destdir="${build.api}"
- classpathref="library.classpath"
- windowtitle="${javadoc.windowtitle}"
- splitindex="${javadoc.splitindex}"
- author="${javadoc.author}"
- version="${javadoc.version}"
- public="${javadoc.public}"
- package="${javadoc.package}"
- protected="${javadoc.protected}"
- private="${javadoc.private}"
- use="${javadoc.use}"
- verbose="${javadoc.verbose}">
- <doctitle><![CDATA[<h1>${module.Name} Final User API Documentation</h1>]]></doctitle>
- <bottom><![CDATA[
- <i>
- <div align="center">
- <font size="-1">Copyright © 2004 JBoss Inc. All Rights Reserved.</font>
- </div>
- </i>
- ]]></bottom>
-
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- </javadoc>
- </target>
-
- <target name="run-tests" depends="javaagent-genadvisor-tests">
- </target>
-
-
- <target name="javaagent-genadvisor-tests" depends="compile-test-classes">
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- <param name="exclude" value="**/OverrideTestCase.class"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="dynamicgenadvisor"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="nameddomain"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="inforesolve"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="typedAdvices"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="annotatedAdviceParams"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="beforeafterthrowingstack"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="beforeafterthrowingscoped"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-javaagent-test" inheritRefs="true">
- <param name="test" value="beforeafterthrowingannotated"/>
- <param name="caller" value="javaagent-genadvisor-tests"/>
- <param name="no.xml" value="true"/>
- <param name="use.annotations" value="true"/>
- </antcall>
-
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 5.0 JAVAAGENT TEST COMMONS -->
- <!-- These targets should not be called directly, use bootclasspath-tests or -->
- <!-- bootclasspath-genadvisor-tests -->
- <!-- ==================================================================================== -->
-
- <target name="_run-javaagent-test">
- <!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="${build.tests.classes}">
- <isset property="use.annotations"/>
- </condition>
- <condition property="jboss.aop.class.path" value="">
- <not>
- <isset property="use.annotations"/>
- </not>
- </condition>
-
- <!-- Set the weaving mode and instrumentor to use-->
- <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
- <equals arg1="${caller}" arg2="javaagent-tests"/>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
- <equals arg1="${caller}" arg2="javaagent-genadvisor-tests"/>
- </condition>
-
- <echo>Running ${test} with instrumentor ${instrumentor}</echo>
-
- <mkdir dir="${build.reports}"/>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
- <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
- <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <!--sysproperty key="jboss.aop.verbose" value="true"/-->
- <sysproperty key="jboss-junit-configuration" value="${caller}"/>
- <formatter type="plain" extension="-${caller}.txt"/>
- <classpath refid="test.classpath"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${caller}.xml"/>
- <classpath>
- <pathelement location="${build.tests.classes}"/>
- </classpath>
- <batchtest todir="${build.reports}"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
- <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
- <exclude name="${exclude}"/>
-
- <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
- <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
- <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
-</project>
Copied: projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml (from rev 71182, projects/aop/trunk/build/build_for_dist/build.xml)
===================================================================
--- projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml (rev 0)
+++ projects/aop/branches/joinpoint_graph/build/build_for_dist/build.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="main" name="JBoss/AOP">
+
+
+ <target name="init">
+
+ <property name="java.optimize" value="true"/>
+ <property name="java.debug" value="false"/>
+
+ <property name="source" value="src/aspect-framework/"/>
+ <property name="source.java" value="${source}/main"/>
+ <property name="source.tests.java" value="${source}/test"/>
+ <property name="source.res" value="${source}/resources"/>
+ <property name="source.etc" value="${source}/etc"/>
+
+ <!-- Where build generated files will go -->
+ <property name="output" value="output"/>
+ <property name="build.reports" value="${output}/reports"/>
+ <property name="build.stylesheets" value="${output}/stylesheets"/>
+ <property name="build.classes" value="${output}/classes"/>
+ <property name="build.classes.retro" value="${output}/classes-retro"/>
+ <property name="build.tests.classes" value="${output}/tests.classes"/>
+ <property name="build.lib" value="${output}/lib"/>
+ <property name="build.api" value="${output}/javadoc"/>
+ <property name="build.etc" value="etc"/>
+ <property name="build.gen-src" value="${output}/gen-src"/>
+ <property name="build.gen" value="${output}/gen"/>
+ <property name="build.bootclasspath" value="${output}/gen-bootclasspath"/>
+
+
+
+ <path id="javassist.classpath">
+ <pathelement path="lib-50/javassist.jar"/>
+ </path>
+
+ <path id="trove.classpath">
+ <pathelement path="lib-50/trove.jar"/>
+ </path>
+
+ <path id="apache.log4j.classpath">
+ <pathelement path="lib-50/log4j.jar"/>
+ </path>
+
+ <path id="qdox.classpath">
+ <pathelement path="lib-14/qdox.jar"/> <!-- needs to be added -->
+ </path>
+
+ <path id="jboss.core.classpath">
+ <pathelement path="lib-50/jboss-common-core.jar"/>
+ </path>
+
+ <path id="jboss.container.classpath">
+ <pathelement path="lib-50/jboss-container.jar"/>
+ </path>
+
+ <path id="jboss.logging.log4j.classpath">
+ <pathelement path="lib-50/jboss-logging-log4j.jar"/>
+ </path>
+
+ <path id="jboss.logging.classpath">
+ <pathelement path="lib-50/jboss-logging-spi.jar"/>
+ </path>
+
+ <path id="library.classpath">
+ <path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="trove.classpath"/>
+ <path refid="qdox.classpath"/>
+ <path refid="jboss.core.classpath"/>
+ <path refid="jboss.container.classpath"/>
+ <path refid="jboss.logging.log4j.classpath"/>
+ <path refid="jboss.logging.classpath"/>
+ <!--
+ <path refid="qdox.classpath"/>
+ <path refid="xdoclet.xdoclet.classpath"/>
+ <path refid="apache.ant.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss/common.core.classpath"/>
+ <path refid="jboss/common.logging.log4j.classpath"/>
+ <path refid="jboss/common.logging.jdk.classpath"/>
+ <path refid="jboss/common.logging.spi.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ -->
+ </path>
+
+ <path id="test.classpath">
+ <path refid="library.classpath"/>
+ <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement path="${build.classes}"/>
+ <pathelement path="lib-test/jboss-test.jar"/> <!-- needs to be added -->
+ <pathelement path="lib-test/junit.jar"/> <!-- needs to be added -->
+ <pathelement path="lib-test/jboss-profiler-jvmti.jar"/> <!-- needs to be added -->
+ </path>
+
+ </target>
+
+ <target name="main" depends="compile-classes">
+
+
+ </target>
+
+
+ <target name="compile-classes" depends="init">
+ <mkdir dir="${build.classes}"/>
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="1.5"
+ source="1.5"
+ debug= "${javac.debug}">
+ <src path="${source.java}"/>
+ <exclude name="org/jboss/aop/definition/**"/>
+ <exclude name="org/jboss/aop/hook/JRockit*"/>
+ <classpath refid="library.classpath"/>
+ </javac>
+ </target>
+
+
+ <target name="compile-test-classes" depends="jars15">
+ <mkdir dir="${build.tests.classes}"/>
+ <javac destdir="${build.tests.classes}"
+ optimize="${javac.optimize}"
+ target="1.5"
+ source="1.5"
+ debug="${javac.debug}">
+ <src path="${source.tests.java}"/>
+ <classpath refid="test.classpath"/>
+ <include name="**/*.java"/>
+ </javac>
+ </target>
+
+
+
+ <target name="jars15" description="Builds all jar files." depends="compile-classes">
+
+ <mkdir dir="${build.lib}"/>
+
+ <!-- Build the jboss-aop-jdk50.jar -->
+ <jar jarfile="${build.lib}/jboss-aop-jdk50.jar"
+ manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes}">
+ <exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
+ </fileset>
+ <fileset file="docs/jboss-aop_1_0.dtd"/>
+ <fileset file ="${build.etc}/jbossorg-eula.txt"/>
+ </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 ="${build.etc}/jbossorg-eula.txt"/>
+ </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">
+ <fileset dir="${build.classes}">
+ <!-- Include everything else -->
+ <include name="org/jboss/lang/**"/>
+ <include name="org/jboss/aop/Advisor.class"/>
+ <include name="org/jboss/aop/AspectManager.class"/>
+ <include name="org/jboss/aop/AspectManager$*.class"/>
+ <include name="org/jboss/aop/ClassAdvisor.class"/>
+ <include name="org/jboss/aop/ClassInstanceAdvisor.class"/>
+ <include name="org/jboss/aop/InstanceAdvisorDelegate.class"/>
+ <include name="org/jboss/aop/Domain.class"/>
+ <include name="org/jboss/aop/InstanceAdvisor.class"/>
+ <include name="org/jboss/aop/MethodInfo.class"/>
+ <include name="org/jboss/aop/InterceptorChainObserver.class"/>
+ <include name="org/jboss/aop/JoinPoint.class"/>
+ <include name="org/jboss/aop/JoinPointInfo.class"/>
+ <include name="org/jboss/aop/MethodJoinPoint.class"/>
+ <include name="org/jboss/aop/*Dispatcher*.class"/>
+ <include name="org/jboss/aop/*Advised.class"/>
+ <include name="org/jboss/aop/advice/AspectDefinition.class"/>
+ <include name="org/jboss/aop/advice/Interceptor.class"/>
+ <include name="org/jboss/aop/instrument/Untransformable.class"/>
+ <include name="org/jboss/aop/joinpoint/Invocation*.class"/>
+ <include name="org/jboss/aop/joinpoint/Joinpoint.class"/>
+ <include name="org/jboss/aop/joinpoint/JoinPointBean.class"/>
+ <include name="org/jboss/aop/joinpoint/MethodExecution.class"/>
+ <include name="org/jboss/aop/joinpoint/MethodInvocation*.class"/>
+ <include name="org/jboss/aop/joinpoint/MethodJoinpoint.class"/>
+ <include name="org/jboss/aop/metadata/SimpleMetaData.class"/>
+ <include name="org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class"/>
+ <include name="org/jboss/aop/metadata/MetaDataResolver.class"/>
+ <include name="org/jboss/aop/metadata/ThreadMetaData.class"/>
+ <include name="org/jboss/aop/proxy/MarshalledInterfaceProxy.class"/>
+ <include name="org/jboss/aop/proxy/MethodMapped.class"/>
+ <include name="org/jboss/aop/proxy/Proxy.class"/>
+ <include name="org/jboss/aop/proxy/ProxyFactory.class"/>
+ <include name="org/jboss/aop/proxy/ProxyMixin.class"/>
+ <include name="org/jboss/aop/util/SecurityActions*.class"/>
+ <include name="org/jboss/aop/util/Marshalled*.class"/>
+ <include name="org/jboss/aop/util/MethodHashing*.class"/>
+ <include name="org/jboss/aop/util/PayloadKey*.class"/>
+ </fileset>
+ <fileset file ="${build.etc}/jbossorg-eula.txt"/>
+ </jar>
+ </target>
+
+
+ <target name="javadoc" depends="init">
+ <javadoc sourcepath="${source.java}"
+ packagenames="org.jboss.*"
+ destdir="${build.api}"
+ classpathref="library.classpath"
+ windowtitle="${javadoc.windowtitle}"
+ splitindex="${javadoc.splitindex}"
+ author="${javadoc.author}"
+ version="${javadoc.version}"
+ public="${javadoc.public}"
+ package="${javadoc.package}"
+ protected="${javadoc.protected}"
+ private="${javadoc.private}"
+ use="${javadoc.use}"
+ verbose="${javadoc.verbose}">
+ <doctitle><![CDATA[<h1>${module.Name} Final User API Documentation</h1>]]></doctitle>
+ <bottom><![CDATA[
+ <i>
+ <div align="center">
+ <font size="-1">Copyright © 2004 JBoss Inc. All Rights Reserved.</font>
+ </div>
+ </i>
+ ]]></bottom>
+
+ <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+ </javadoc>
+ </target>
+
+ <target name="run-tests" depends="javaagent-genadvisor-tests">
+ </target>
+
+
+ <target name="javaagent-genadvisor-tests" depends="compile-test-classes">
+ <!-- Tests only applicable for this weaving mode -->
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="override"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ <param name="exclude" value="**/OverrideTestCase.class"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="dynamicgenadvisor"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="nameddomain"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="inforesolve"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="typedAdvices"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="annotatedAdviceParams"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="beforeafterthrowingstack"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="beforeafterthrowingscoped"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ </antcall>
+ <antcall target="_run-javaagent-test" inheritRefs="true">
+ <param name="test" value="beforeafterthrowingannotated"/>
+ <param name="caller" value="javaagent-genadvisor-tests"/>
+ <param name="no.xml" value="true"/>
+ <param name="use.annotations" value="true"/>
+ </antcall>
+
+ </target>
+
+ <!-- ==================================================================================== -->
+ <!-- JDK 5.0 JAVAAGENT TEST COMMONS -->
+ <!-- These targets should not be called directly, use bootclasspath-tests or -->
+ <!-- bootclasspath-genadvisor-tests -->
+ <!-- ==================================================================================== -->
+
+ <target name="_run-javaagent-test">
+ <!-- Check for jboss-aop.xml override -->
+ <condition property="jboss.aop.path" value="${aop.xml}">
+ <isset property="aop.xml"/>
+ </condition>
+ <condition property="jboss.aop.path" value="">
+ <isset property="no.xml"/>
+ </condition>
+ <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
+ <not>
+ <isset property="aop.xml"/>
+ </not>
+ </condition>
+
+ <!-- Get -Djboss.aop.class.path from passed in parameters -->
+ <condition property="jboss.aop.class.path" value="${build.tests.classes}">
+ <isset property="use.annotations"/>
+ </condition>
+ <condition property="jboss.aop.class.path" value="">
+ <not>
+ <isset property="use.annotations"/>
+ </not>
+ </condition>
+
+ <!-- Set the weaving mode and instrumentor to use-->
+ <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
+ <equals arg1="${caller}" arg2="javaagent-tests"/>
+ </condition>
+ <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
+ <equals arg1="${caller}" arg2="javaagent-genadvisor-tests"/>
+ </condition>
+
+ <echo>Running ${test} with instrumentor ${instrumentor}</echo>
+
+ <mkdir dir="${build.reports}"/>
+ <junit printsummary="yes" fork="yes" haltonfailure="no">
+ <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/>
+ <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
+ <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
+ <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
+ <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
+ <!--sysproperty key="jboss.aop.verbose" value="true"/-->
+ <sysproperty key="jboss-junit-configuration" value="${caller}"/>
+ <formatter type="plain" extension="-${caller}.txt"/>
+ <classpath refid="test.classpath"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-${caller}.xml"/>
+ <classpath>
+ <pathelement location="${build.tests.classes}"/>
+ </classpath>
+ <batchtest todir="${build.reports}"
+ haltonfailure="false"
+ fork="true">
+ <fileset dir="${build.tests.classes}">
+ <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
+ <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
+ <exclude name="${exclude}"/>
+
+ <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
+ <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
+ <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+</project>
Modified: projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/pom.xml 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/pom.xml 2008-03-24 03:56:27 UTC (rev 71187)
@@ -9,59 +9,131 @@
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jbossaop-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>JBoss AOP Maven Plugin</name>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.0.8</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.2</version>
+ <version>2.0.8</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.2</version>
+ <version>1.4.9</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.alpha2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
</dependency>
-
+
<dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.ga</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.1-beta-5</version>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.0.CR3</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <!-- included in jboss-container -->
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <!-- end included in jboss-container -->
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <!-- this is needed by aopc
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ -->
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ </dependencies>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
-
- </dependencies>
<repositories>
<repository>
<id>repository.jboss.org</id>
@@ -97,9 +169,28 @@
<configuration>
<source>${jdkVersion}</source>
<target>${jdkVersion}</target>
+ <!--
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
+ -->
</configuration>
</plugin>
+<!--
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compileSourceRoots>
+ <compileSourceRoot>${basedir}\target\test-classes\unit\compiler-basic-test\src\main\java</compileSourceRoot>
+ </compileSourceRoots>
+ <compilerId>javac</compilerId>
+ <debug>true</debug>
+ <outputDirectory>${basedir}\target\test\unit\compiler-basic-test\target\classes</outputDirectory>
+ <buildDirectory>${basedir}\target\test\unit\compiler-basic-test\target</buildDirectory>
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
+ </configuration>
+ </plugin>
+ -->
+
</plugins>
</build>
Modified: projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPCMojo.java 2008-03-24 03:56:27 UTC (rev 71187)
@@ -26,10 +26,8 @@
import java.io.IOException;
import java.io.StringReader;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -44,16 +42,12 @@
* Use it by running: mvn jbossaop:compile
*
* Supported options:
- * - aoppath (default src/main/resources/jboss-aop.xml)
+ * - aoppaths[] (default src/main/resources/jboss-aop.xml)
* - verbose (default true)
* - suppress (default false)
* - noopt (default false)
* - report (default false)
- * - includes
- *
- * TODO: multiple jboss-aop.xml files are supported as in ant. eg, they are provided in
- * the same element, and separated with File.pathSeparator. this is not portable and will
- * be looked into.
+ * - includeProjectDependency (default false)
*
* @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
* @goal compile
@@ -73,7 +67,7 @@
/**
*
*
- * @parameter expression="${supress}" default-value="false"
+ * @parameter expression="${supress}" default-value="true"
*/
private boolean suppress;
@@ -92,15 +86,16 @@
private boolean report;
/**
+ * If it is set to true all project dependencies will also be included to the aop classpath
*
- *
- * @parameter expression="${failOnError}" default-value="true"
+ * @parameter expression="${includeProjectDependency}" default-value="false"
*/
- private boolean failOnError;
+ private boolean includeProjectDependency;
+
/**
*
- * @parameter expression="${classPath}" default-value="${project.build.outputDirectory}"
+ * @parameter expression="${classPath}" default-value=""
*/
private String classPath;
@@ -108,35 +103,18 @@
*
* @parameter expression="${aopPaths}" default-value={src/main/resources/jboss-aop.xml}
*/
- private String[] aoppaths;
+ private File[] aoppaths;
/**
*
* @parameter expression="${aopClassPath}" default-value=""
*/
private String aopClassPath;
-
- /**
- *
- * @parameter expression="${compilerClassPath}" default-value=""
- */
- private String compilerClassPath;
-
- /**
- * @parameter default-value="${project.compileDependencies}"
- * @required
- * @readonly
- */
- private List<Dependency> cDependencies;
-
- /**
- * @parameter default-value="${project.dependency}"
- * @required
- * @readonly
- */
- private Dependency pDependency;
/**
+ * Set this to specify certain classes that will be weaved. This prevents the parser to check
+ * all the classes in eg target/classes.
+ *
* @parameter
*/
private String[] includes;
@@ -145,6 +123,7 @@
/**
* @parameter expression="${project}"
+ * @readonly
*/
private MavenProject project;
@@ -164,23 +143,30 @@
private String createClassPathList()
{
+ //if classPath is set, use only that
+ if(getClassPath() != null && getClassPath().length() > 0)
+ return getClassPath();
+
StringBuffer sb = new StringBuffer();
for(Artifact a : pluginArtifacts)
{
sb.append(a.getFile().toString()).append(File.pathSeparator);
}
-// for(Object o : project.getDependencyArtifacts())
-// {
-// sb.append(((Artifact) o).getFile().toString()).append(File.pathSeparator);
-// }
+ if(includeProjectDependency)
+ {
+ for(Object o : project.getDependencyArtifacts())
+ {
+ if(((Artifact) o).getFile() != null)
+ sb.append(((Artifact) o).getFile().toString()).append(File.pathSeparator);
+ }
+ }
if(isTest())
- sb.append(project.getBuild().getTestOutputDirectory());
- else
+ sb.append(project.getBuild().getTestOutputDirectory()).append(File.pathSeparator);
+
sb.append(project.getBuild().getOutputDirectory());
- System.err.println("CLASSPATH: "+sb.toString());
return sb.toString();
}
@@ -204,7 +190,9 @@
if(getAopClassPath() != null && getAopClassPath().length() > 0)
cl.addArguments(new String[] { "-aopclasspath", getAopClassPath()});
- cl.addArguments(new String[] { "-aoppath", getAoppath()});
+ String aoppath = getAoppath();
+ if(aoppath != null && aoppath.length() > 0)
+ cl.addArguments(new String[] { "-aoppath", aoppath});
if(includes != null && includes.length > 0)
{
@@ -256,19 +244,22 @@
private String getAoppath()
{
- if(aoppaths.length > 0)
+ StringBuffer sb = new StringBuffer();
+ if(aoppaths != null)
{
- StringBuffer sb = new StringBuffer();
- for(String aoppath : aoppaths)
+ for(File aoppath : aoppaths)
{
- if(sb.length() > 0)
- sb.append(File.pathSeparator);
- sb.append(aoppath);
+ if(aoppath != null)
+ {
+ if(sb.length() > 0)
+ sb.append(File.pathSeparator);
+ sb.append(aoppath.getAbsolutePath());
+ }
}
return sb.toString();
}
else
- return new File(project.getBasedir(),"src/main/resources/jboss-aop.xml").getAbsolutePath();
+ return null;
}
private void processStream(BufferedReader input, boolean isError)
@@ -295,11 +286,6 @@
return classPath;
}
- private String getCompilerClassPath()
- {
- return compilerClassPath;
- }
-
private boolean isVerbose()
{
return verbose;
Copied: projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java (from rev 71182, projects/aop/trunk/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java)
===================================================================
--- projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java (rev 0)
+++ projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossAOPMojo.java 2008-03-24 03:56:27 UTC (rev 71187)
@@ -0,0 +1,242 @@
+/*
+ * 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.maven.plugins;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+/**
+ * A Simple mojo that uses JBoss AOP to run a class with aop weaving enabled.
+ * Supports compiletime and loadtime.
+ *
+ * @author <a href="stale.pedersen at jboss.org">Stale W. Pedersen</a>
+ * @version $Revision: 1.1 $
+ * @requiresDependencyResolution package
+ * @goal run
+ * @phase package
+ */
+public class JBossAOPMojo extends AbstractMojo
+{
+
+ /**
+ * If it is set to true all project dependencies will also be included to the aop classpath
+ *
+ * @parameter expression="${includeProjectDependency}" default-value="false"
+ */
+ private boolean includeProjectDependency;
+
+ /**
+ *
+ * @parameter expression="${classPath}" default-value=""
+ */
+ private String classPath;
+
+ /**
+ *
+ * @parameter expression="${aopPaths}" default-value={src/main/resources/jboss-aop.xml}
+ */
+ private File[] aoppaths;
+
+ /**
+ *
+ * @parameter expression="${aopClassPath}" default-value=
+ */
+ private String aopClassPath;
+
+ /**
+ *
+ * @parameter expression="${executable}" default-value=
+ * @required
+ */
+ private String executable;
+
+ /**
+ *
+ * @parameter expression="${loadtime}" default-value="false"
+ */
+ private boolean loadtime;
+
+ /**
+ * The plugin dependencies.
+ *
+ * @parameter expression="${plugin.artifacts}"
+ * @required
+ * @readonly
+ */
+ private List<Artifact> pluginArtifacts;
+
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ public void execute() throws MojoExecutionException, MojoFailureException
+ {
+ executeOutOfProcess(createCommandLine());
+
+ }
+
+ private void executeOutOfProcess(Commandline cl)
+ {
+
+ CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
+ CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
+ try
+ {
+ CommandLineUtils.executeCommandLine( cl, out, err );
+
+ processStream(new BufferedReader( new StringReader( err.getOutput()) ), true);
+ processStream(new BufferedReader( new StringReader( out.getOutput()) ), false);
+ }
+ catch (CommandLineException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Commandline createCommandLine()
+ {
+ Commandline cl = new Commandline();
+ cl.setExecutable("java");
+ cl.setWorkingDirectory(project.getBuild().getOutputDirectory());
+
+ if(loadtime)
+ {
+ String javaagent = getJavaagentPath();
+ if(javaagent != null)
+ cl.addArguments(new String[] { "-javaagent:"+javaagent});
+ }
+ cl.addArguments(new String[] { "-cp", createClassPathList()});
+
+ String aoppath = getAoppath();
+ if(aoppath != null && aoppath.length() > 0)
+ cl.addArguments(new String[] { "-Djboss.aop.path="+ aoppath});
+
+ if(aopClassPath != null && aopClassPath.length() > 0)
+ cl.addArguments(new String[] { "-Djboss.aop.class.path="+ aopClassPath});
+
+ cl.addArguments(new String[] { executable});
+
+ if(getLog().isDebugEnabled())
+ {
+ getLog().debug("Executing aop: "+cl.toString());
+ }
+ return cl;
+ }
+
+ private String getJavaagentPath()
+ {
+ for(Artifact a : pluginArtifacts)
+ {
+ if(a.getArtifactId().equals("jboss-aop"))
+ {
+ return a.getFile().toString();
+ }
+ }
+ return null;
+ }
+
+ private String createClassPathList()
+ {
+ //if classPath is set, use only that
+ if(classPath != null && classPath.length() > 0)
+ return classPath;
+
+ StringBuffer sb = new StringBuffer();
+ for(Artifact a : pluginArtifacts)
+ {
+ if(a.getGroupId().startsWith("org.jboss")
+ || a.getGroupId().startsWith("jboss")
+ || a.getGroupId().startsWith("trove"))
+ sb.append(a.getFile().toString()).append(File.pathSeparator);
+ }
+
+ if(includeProjectDependency)
+ {
+ for(Object o : project.getDependencyArtifacts())
+ {
+ if(((Artifact) o).getFile() != null)
+ sb.append(((Artifact) o).getFile().toString()).append(File.pathSeparator);
+ }
+ }
+
+ sb.append(project.getBuild().getOutputDirectory());
+
+ return sb.toString();
+ }
+
+
+ private String getAoppath()
+ {
+ StringBuffer sb = new StringBuffer();
+ if(aoppaths != null)
+ {
+ for(File aoppath : aoppaths)
+ {
+ if(aoppath != null)
+ {
+ if(sb.length() > 0)
+ sb.append(File.pathSeparator);
+ sb.append(aoppath.getAbsolutePath());
+ }
+ }
+ return sb.toString();
+ }
+ else
+ return null;
+ }
+
+ private void processStream(BufferedReader input, boolean isError)
+ {
+ String err = null;
+ try
+ {
+ while( (err = input.readLine()) != null)
+ {
+ if(isError)
+ getLog().error(err);
+ else
+ getLog().info(err);
+ }
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/maven-jbossaop-plugin/src/main/java/org/jboss/maven/plugins/JBossTestAOPCMojo.java 2008-03-24 03:56:27 UTC (rev 71187)
@@ -41,7 +41,7 @@
* @author <a href="mailto:stale.pedersen at jboss.org">Stale W. Pedersen</a>
* @goal compile-test
* @phase process-test-classes
- * @requiresDependencyResolution
+ * @requiresDependencyResolution compile-test
*/
public class JBossTestAOPCMojo extends JBossAOPCMojo
{
Modified: projects/aop/branches/joinpoint_graph/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- projects/aop/branches/joinpoint_graph/tools/etc/buildmagic/buildmagic.ent 2008-03-24 03:50:38 UTC (rev 71186)
+++ projects/aop/branches/joinpoint_graph/tools/etc/buildmagic/buildmagic.ent 2008-03-24 03:56:27 UTC (rev 71187)
@@ -12,7 +12,7 @@
<property name="buildmagic.ant16.baseversion" value="1.6"/>
<!-- Set the version of the release here -->
- <property name="aop.version" value="jboss-aop-2.0.0.CR2"/>
+ <property name="aop.version" value="jboss-aop-2.0.0.CR8"/>
<property name="aop.title" value="JBoss AOP Framework"/>
<property name="module.version" value="j${aop.version}"/>
@@ -49,7 +49,8 @@
<property name="project.build" value="${project.root}/build"/>
<property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
- <property name="project.release" value="${project.build}/output/${aop.version}"/>
+ <property name="project.output" value="${project.build}/output"/>
+ <property name="project.release" value="${project.output}/${aop.version}"/>
<!-- Setup the module environment. -->
More information about the jboss-cvs-commits
mailing list