[jboss-cvs] JBossAS SVN: r83110 - in projects/aop/branches/Branch_2_0: build and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 20 15:13:08 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-01-20 15:13:06 -0500 (Tue, 20 Jan 2009)
New Revision: 83110
Modified:
projects/aop/branches/Branch_2_0/build/build.xml
projects/aop/branches/Branch_2_0/build/pom.xml
projects/aop/branches/Branch_2_0/pom.xml
Log:
[JBAOP-693] Adding jarjar feature to branch 2.0.
Modified: projects/aop/branches/Branch_2_0/build/build.xml
===================================================================
--- projects/aop/branches/Branch_2_0/build/build.xml 2009-01-20 16:44:13 UTC (rev 83109)
+++ projects/aop/branches/Branch_2_0/build/build.xml 2009-01-20 20:13:06 UTC (rev 83110)
@@ -25,16 +25,16 @@
-->
<target name="init" depends="verify-environment, init-maven-parent">
-
- <!-- Defines repository.home -->
- <property file="local.properties"/>
-
- <!-- Bits for building source archives -->
- <patternset id="source.ignore">
- <exclude name="**/output/**"/>
- <exclude name="**/target/**"/>
- <exclude name="**/.svn/**" />
- </patternset>
+
+ <!-- Defines repository.home -->
+ <property file="local.properties"/>
+
+ <!-- Bits for building source archives -->
+ <patternset id="source.ignore">
+ <exclude name="**/output/**"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/.svn/**" />
+ </patternset>
<!-- Set the version of the release here -->
<property name="project.name" value="jboss-aop"/>
@@ -45,7 +45,7 @@
<!-- Setup the project environment. -->
<dirname property="project.root" file="${basedir}"/>
<property name="project.build" value="${project.root}/build"/>
- <property name="project.tools" value="${project.root}/tools"/>
+ <property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
<property name="project.output" value="${project.build}/output"/>
<property name="project.release" value="${project.output}/${project.build.name}"/>
@@ -233,7 +233,7 @@
<!-- Add the files from 'aop' -->
<!-- ================================================== -->
- <!-- build.xml that will compile src/tests and run tests from the dist package -->
+ <!-- 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"/>
@@ -286,21 +286,21 @@
<fileset dir="${project.root}/aop/target/site">
<include name="apidocs/**"/>
</fileset>
- </copy>
+ </copy>
-
- <copy todir="${project.release}/src/aspect-framework" filtering="no">
- <fileset dir="${project.root}/aop/src">
- <include name="main/**/*.java"/>
- <include name="main/**/*.jjt"/>
- <include name="test/**/*.java"/>
- <include name="resources/test/**/*.xml"/>
- <include name="resources/bin/**/*"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
-
+
+ <copy todir="${project.release}/src/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/src">
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.jjt"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/test/**/*.xml"/>
+ <include name="resources/bin/**/*"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
<!-- ================================================== -->
<!-- Add the files from 'asintegration' -->
<!-- ================================================== -->
@@ -321,34 +321,34 @@
</fileset>
</copy>
- <copy todir="${project.release}/src/asintegration-core" filtering="no">
- <fileset dir="${project.root}/asintegration-core/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/src/asintegration-jmx" filtering="no">
- <fileset dir="${project.root}/asintegration-jmx/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- <copy todir="${project.release}/src/asintegration-mc" filtering="no">
- <fileset dir="${project.root}/asintegration-mc/src">
- <include name="main/**/*.java"/>
- <include name="etc/**"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
-
+ <copy todir="${project.release}/src/asintegration-core" filtering="no">
+ <fileset dir="${project.root}/asintegration-core/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/asintegration-jmx" filtering="no">
+ <fileset dir="${project.root}/asintegration-jmx/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${project.release}/src/asintegration-mc" filtering="no">
+ <fileset dir="${project.root}/asintegration-mc/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
<!-- ================================================== -->
<!-- Add the files from 'aspects' -->
<!-- ================================================== -->
@@ -359,17 +359,17 @@
</fileset>
</copy>
- <copy todir="${project.release}/src/aspects" filtering="no">
- <fileset dir="${project.root}/aspects/src">
- <include name="main/**/*.java"/>
- <include name="test/**/*.java"/>
- <include name="resources/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
+ <copy todir="${project.release}/src/aspects" filtering="no">
+ <fileset dir="${project.root}/aspects/src">
+ <include name="main/**/*.java"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
-
<!-- ================================================== -->
<!-- Now pull everything together -->
<!-- ================================================== -->
@@ -424,7 +424,8 @@
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/trove.jar" file="${trove:trove:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/trove.jar" file="${trove:trove:jar}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jarjar.jar" file="${com.google.code:jarjar:jar}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
<!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
Modified: projects/aop/branches/Branch_2_0/build/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_0/build/pom.xml 2009-01-20 16:44:13 UTC (rev 83109)
+++ projects/aop/branches/Branch_2_0/build/pom.xml 2009-01-20 20:13:06 UTC (rev 83110)
@@ -20,6 +20,10 @@
<artifactId>jrockit-pluggable-instrumentor</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.code</groupId>
+ <artifactId>jarjar</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -36,4 +40,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/aop/branches/Branch_2_0/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_0/pom.xml 2009-01-20 16:44:13 UTC (rev 83109)
+++ projects/aop/branches/Branch_2_0/pom.xml 2009-01-20 20:13:06 UTC (rev 83110)
@@ -33,6 +33,7 @@
<version.org.jboss.man>2.0.0.GA</version.org.jboss.man>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
<version.xdoclet>1.2.3</version.xdoclet>
+ <version.jarjar>1.0</version.jarjar>
</properties>
<build>
@@ -572,6 +573,11 @@
<artifactId>xjavadoc</artifactId>
<version>${version.xdoclet}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code</groupId>
+ <artifactId>jarjar</artifactId>
+ <version>${version.jarjar}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
More information about the jboss-cvs-commits
mailing list