[jboss-cvs] JBossAS SVN: r101085 - in projects/aop/trunk: aop and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 17 12:09:41 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-17 12:09:40 -0500 (Wed, 17 Feb 2010)
New Revision: 101085
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/build/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-767] Merge to trunk, remove jrockit pluggable instrumentor
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/aop/pom.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -361,7 +361,7 @@
</dependencies>
- <profiles>
+ <!--profiles>
<profile>
<id>jrockit-build</id>
<activation>
@@ -385,7 +385,9 @@
<configuration>
<tasks>
<echo message="jrockit.home=${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}">
@@ -434,7 +436,6 @@
</plugins>
</build>
</profile>
-
- </profiles>
+ </profiles-->
</project>
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -304,7 +304,6 @@
<copy todir="${jboss.bin.dir}" overwrite="true">
<fileset dir="../../lib">
<include name="pluggable-instrumentor.jar"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
</fileset>
</copy>
</target>
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -104,7 +104,6 @@
<copy todir="${jboss.bin.dir}" overwrite="true">
<fileset dir="../lib">
<include name="pluggable-instrumentor.jar"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
</fileset>
</copy>
</target>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/build/build.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -124,12 +124,10 @@
<target name="most" depends="maven-build-install"
description="Executes all modules and builds most everything."/>
- <target name="maven-build-install" depends="init, set-jrockit" description="Call maven install">
+ <target name="maven-build-install" depends="init" description="Call maven install">
<property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
- <echo message="jrockit: ${jrockit.build.param}"/>
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}"
+ <maven basedir="${basedir}/../" options="${build.maven.opts}"
goal="install" resultproperty="maven.install.result"/>
<fail message="Unable to build maven modules. See maven output for details.">
@@ -141,12 +139,10 @@
</fail>
</target>
- <target name="maven-javadoc" depends="init, set-jrockit" description="Generate the maven site">
+ <target name="maven-javadoc" depends="init" description="Generate the maven site">
<property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
- <echo message="jrockit: ${jrockit.build.param}"/>
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}"
+ <maven basedir="${basedir}/../" options="${build.maven.opts}"
goal="javadoc:javadoc" resultproperty="maven.javadoc.result"/>
<fail message="Unable to complete maven build. See maven output for details.">
@@ -159,12 +155,11 @@
</target>
<!-- Clean the maven part of the build -->
- <target name="maven-build-clean" depends="init, set-jrockit">
+ <target name="maven-build-clean" depends="init">
<property name="build.maven.opts" value=""/>
- <property name="jrockit.build.param" value=""/>
- <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}"
+ <maven basedir="${basedir}/../" options="${build.maven.opts}"
goal="clean" resultproperty="maven.clean.result"/>
<fail message="Unable to clean maven modules. See maven output for details.">
@@ -176,10 +171,6 @@
</fail>
</target>
- <target name="set-jrockit" depends="init" if="jrockit.home">
- <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
- </target>
-
<!-- TODO: Maybe this can be set up to control offline maven builds. -->
<target name="check.inhibit.downloads">
<condition property="inhibit.downloads">
@@ -316,7 +307,6 @@
<include name="asintegration-jmx/src/"/>
<include name="asintegration-mc/src/"/>
<include name="aspects/src/"/>
- <include name="jrockit-pluggable-instrumentor/src/"/>
<include name="pluggable-instrumentor/src"/>
<exclude name="**/target/**"/>
<exclude name="**/output/**"/>
@@ -333,7 +323,6 @@
<property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
<property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
<property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/jboss-aop-asintegration-mc.jar"/>
- <property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/jrockit-pluggable-instrumentor/target/jrockit-pluggable-instrumentor.jar"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
<property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
<property name="aop.readme-as5.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS5.txt"/>
@@ -347,7 +336,6 @@
<copy todir="${project.release}/lib" file="${aop.50.single.location}"/>
<copy todir="${project.release}/lib" file="${project.root}/aop/target/lib/jboss-aop-client.jar"/>
<copy todir="${project.release}/lib" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/lib" file="${aop.jrockit-pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib" file="${aop.pluggable-instrumentor.location}"/>
<copy tofile="${project.release}/lib/javassist.jar" file="${javassist:javassist:jar}"/>
<copy tofile="${project.release}/lib/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
@@ -393,7 +381,6 @@
<copy tofile="${project.release}/jboss-50-install/lib/trove.jar" file="${trove:trove:jar}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.aspect-library50.location}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
- <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.jrockit-pluggable-instrumentor.location}"/>
<!-- Copy aophelper to the dist -->
<mkdir dir="${project.release}/aophelper"/>
@@ -413,7 +400,7 @@
depends="init"
description="Builds the default release structure, minus the reference documentation">
- <maven basedir="${basedir}/../aop/docs" options="${jrockit.build.param} ${build.maven.opts}"
+ <maven basedir="${basedir}/../aop/docs" options="${build.maven.opts}"
goal="install" resultproperty="maven.install.result"/>
<mkdir dir="${project.release}/docs/aspect-framework/reference/en"/>
Modified: projects/aop/trunk/build/pom.xml
===================================================================
--- projects/aop/trunk/build/pom.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/build/pom.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -39,5 +39,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2010-02-17 17:03:48 UTC (rev 101084)
+++ projects/aop/trunk/pom.xml 2010-02-17 17:09:40 UTC (rev 101085)
@@ -191,11 +191,11 @@
<artifactId>pluggable-instrumentor</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jrockit-pluggable-instrumentor</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-core</artifactId>
More information about the jboss-cvs-commits
mailing list