[jboss-cvs] JBossAS SVN: r79661 - in projects/aop/trunk: aop/src/test/org/jboss/test/aop and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 17 12:33:15 EDT 2008
Author: pgier
Date: 2008-10-17 12:33:15 -0400 (Fri, 17 Oct 2008)
New Revision: 79661
Modified:
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/postweavingmixins/PostWeavingMixinsTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop217typedefredeploy/TypeDefRedeployTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/ScenarioPropertyReaderFactory.java
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/build/build.xml
Log:
Remove the use of output directory from aspects and aop modules. Remove some unused properties from test script.
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2008-10-17 16:33:15 UTC (rev 79661)
@@ -29,24 +29,12 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <!--
- | Initialize the build system. Must depend on '_buildmagic:init'.
- | Other targets should depend on 'init' or things will mysteriously fail.
- -->
-
<target name="init" depends="init-maven-environment">
- <!-- Defines repository.home -->
+ <!-- Defines property overrides -->
<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 -->
+ <!-- Set the name and version of the project here -->
<property name="project.name" value="${maven.project.artifactId}"/>
<property name="project.version" value="${maven.project.version}"/>
<property name="project.build.name" value="${project.name}-${project.version}"/>
@@ -55,50 +43,30 @@
<echo message="Title: ${project.title}"/>
<!-- 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.output" value="${project.build}/output"/>
- <property name="project.release" value="${project.output}/${project.build.name}"/>
+ <dirname property="project.parent.root" file="${basedir}"/>
+ <property name="project.root" value="${basedir}"/>
+ <property name="project.build" value="${project.parent.root}/build"/>
+ <property name="project.tools" value="${project.parent.root}/tools"/>
+ <property name="project.source" value="${project.root}/src"/>
+ <property name="project.output" value="${maven.project.build.directory}"/>
- <!-- Setup the module environment. -->
- <property name="module.root" value="${basedir}"/>
- <property file="${module.root}/local.properties"/>
- <property name="module.source" value="${module.root}/src"/>
- <property name="module.output" value="${module.root}/output"/>
- <property name="module.tools" value="${module.root}/tools"/>
-
<!-- Include user and project property overrides. -->
<property file="${project.build}/local.properties"/>
- <property file="${user.home}/.buildmagic.properties"/>
<property file="${user.home}/.ant.properties"/>
<!-- Setup the build.log -->
<property name="buildlog.level" value="info"/>
- <record name="${basedir}/build.log" append="no" loglevel="${buildlog.level}"/>
+ <record name="${project.output}/build.log" append="no" loglevel="${buildlog.level}"/>
<property name="init-buildlog.disable" value="true"/>
- <!-- Setup the build timestamp & build identifer properties -->
- <tstamp>
- <format property="build.number" pattern="yyyyMMddHHmm"/>
- <format property="YEAR" pattern="yyyy"/>
- </tstamp>
- <property name="build.id" value="${build.number}"/>
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="maven.dependencies.test.classpath"/>
- </path>
-
<path id="jboss.test.classpath">
<pathelement location="${jboss:jboss-test:jar}"/>
</path>
<path id="junit.junit.classpath">
<pathelement location="${junit:junit:jar}"/>
</path>
- <property name="build.directory" value="${maven.project.build.directory}"/>
<property name="build.artifact.name" value="${maven.project.build.finalName}.jar"/>
- <property name="build.artifact" value="${build.directory}/${build.artifact.name}"/>
+ <property name="build.artifact" value="${maven.project.build.directory}/${build.artifact.name}"/>
<path id="jboss.aop.classpath">
<pathelement location="${build.artifact}"/>
</path>
@@ -125,23 +93,18 @@
</condition>
<!-- Where source files live -->
- <property name="source.tests.java" value="${module.source}/test"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.res" value="${module.source}/resources"/>
+ <property name="source.tests.java" value="${project.source}/test"/>
+ <property name="source.etc" value="${project.source}/etc"/>
+ <property name="source.res" value="${project.source}/resources"/>
<property name="source.stylesheets" value="src/stylesheets"/>
<echo message="${source.tests.java}"/>
<!-- Where build generated files will go -->
- <property name="build.reports" value="output/reports"/>
- <property name="build.stylesheets" value="${module.output}/stylesheets"/>
- <property name="build.tests.classes" value="${module.output}/tests.classes"/>
- <property name="build.lib" value="${module.output}/lib"/>
+ <property name="build.reports" value="${project.output}/reports"/>
+ <property name="build.stylesheets" value="${project.output}/stylesheets"/>
+ <property name="build.tests.classes" value="${project.output}/test-classes"/>
+ <property name="build.lib" value="${project.output}/lib"/>
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
- <property name="install.root" value="${module.output}/${install.id}"/>
-
<!-- classpath and local.classpath must have a value using with a path -->
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
@@ -150,7 +113,7 @@
<path id="javac.classpath">
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
- <path refid="library.classpath"/>
+ <path refid="maven.dependencies.test.classpath"/>
<pathelement path="${build.artifact}"/>
</path>
@@ -160,7 +123,7 @@
</path>
<path id="test.classpath">
- <path refid="library.classpath"/>
+ <path refid="maven.dependencies.test.classpath"/>
<pathelement path="${build.artifact}"/>
</path>
@@ -177,7 +140,7 @@
</path>
<path id="aopc.task.classpath">
- <path refid="library.classpath"/>
+ <path refid="maven.dependencies.test.classpath"/>
<path refid="jboss.aop.classpath"/>
</path>
@@ -186,19 +149,11 @@
<path path="${jrockit.home}/jre/lib/${JROCKIT_API_AVAILABLE}"/>
</path>
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <path refid="javac.classpath"/>
- </path>
-
<!-- The temp folder for aopc -->
- <property name="aopc.tmpdir" value="output/aopctmp"/>
+ <property name="aopc.tmpdir" value="${maven.project.build.directory}/aopctmp"/>
<delete dir="${aopc.tmpdir}" failonerror="true" deleteonexit="true"/>
<mkdir dir="${aopc.tmpdir}"/>
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jbos.aop.*"/>
-
<!-- Override JUnit defaults -->
<property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
<property name="junit.batchtest.todir" value="${build.reports}"/>
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/pom.xml 2008-10-17 16:33:15 UTC (rev 79661)
@@ -169,16 +169,15 @@
<phase>package</phase>
<configuration>
<tasks>
- <mkdir dir="${basedir}/output" />
- <mkdir dir="${basedir}/output/lib" />
- <copy todir="${basedir}/output/etc">
+ <mkdir dir="${project.build.directory}/lib" />
+ <copy todir="${project.build.directory}/etc">
<fileset dir="${basedir}/src/etc" />
</copy>
- <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${basedir}/output/lib/jboss-aop.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${basedir}/output/lib/jboss-aop-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${basedir}/output/lib/jboss-aop-client.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${basedir}/output/lib/jboss-aop-client-sources.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${basedir}/output/lib/jboss-aop-single.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}.jar" tofile="${project.build.directory}/lib/jboss-aop.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client.jar" tofile="${project.build.directory}/lib/jboss-aop-client.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar" tofile="${project.build.directory}/lib/jboss-aop-client-sources.jar" />
+ <copy file="${project.build.directory}/${project.artifactId}-single.jar" tofile="${project.build.directory}/lib/jboss-aop-single.jar" />
</tasks>
</configuration>
</execution>
@@ -284,19 +283,6 @@
</execution>
</executions>
</plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -434,9 +420,8 @@
<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">
+ <mkdir dir="${project.build.directory}/lib" />
+ <jar jarfile="${project.build.directory}/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" />
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/AOPTestWithSetup.java 2008-10-17 16:33:15 UTC (rev 79661)
@@ -63,7 +63,7 @@
{
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
String location = url.toString();
- int index = location.indexOf("/output/");
+ int index = location.indexOf("/target/");
location = location.substring(0, index);
location = location + relativePath;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/postweavingmixins/PostWeavingMixinsTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/postweavingmixins/PostWeavingMixinsTestCase.java 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/postweavingmixins/PostWeavingMixinsTestCase.java 2008-10-17 16:33:15 UTC (rev 79661)
@@ -96,7 +96,7 @@
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
System.out.println("class url: " + url);
String location = url.toString();
- int index = location.indexOf("/output/tests.classes");
+ int index = location.indexOf("/target/test-classes");
location = location.substring(0, index);
location = location + "/src/resources/test/postweavingmixins/mixins-aop.xml";
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop217typedefredeploy/TypeDefRedeployTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop217typedefredeploy/TypeDefRedeployTestCase.java 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/regression/jbaop217typedefredeploy/TypeDefRedeployTestCase.java 2008-10-17 16:33:15 UTC (rev 79661)
@@ -62,7 +62,7 @@
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
System.out.println("class url: " + url);
String location = url.toString();
- int index = location.indexOf("/output/");
+ int index = location.indexOf("/target/");
location = location.substring(0, index);
location = location + "/src/resources/test/regression/jboss-aop.xml";
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/ScenarioPropertyReaderFactory.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/ScenarioPropertyReaderFactory.java 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/stress/ScenarioPropertyReaderFactory.java 2008-10-17 16:33:15 UTC (rev 79661)
@@ -46,7 +46,7 @@
URL url = this.getClass().getProtectionDomain().getCodeSource().getLocation();
System.out.println("class url: " + url);
String location = url.toString();
- int index = location.indexOf("/output/");
+ int index = location.indexOf("/target/");
location = location.substring(0, index);
baseDirectory = location + "/src/resources/test/stress/";
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/aspects/pom.xml 2008-10-17 16:33:15 UTC (rev 79661)
@@ -10,6 +10,7 @@
<description>JBoss AOP Aspects</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main</sourceDirectory>
<!--<testSourceDirectory>src/test</testSourceDirectory>-->
<resources>
@@ -56,41 +57,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>copy-output-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output" />
- <mkdir dir="${basedir}/output/lib" />
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library.jar" />
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" tofile="${basedir}/output/lib/jboss-standalone-aspect-library-sources.jar" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-10-17 16:15:53 UTC (rev 79660)
+++ projects/aop/trunk/build/build.xml 2008-10-17 16:33:15 UTC (rev 79661)
@@ -374,9 +374,9 @@
<!-- Now pull everything together -->
<!-- ================================================== -->
- <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop.jar"/>
- <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-single.jar"/>
- <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library.jar"/>
+ <property name="aop.50.location" value="${project.root}/aop/target/lib/jboss-aop.jar"/>
+ <property name="aop.50.single.location" value="${project.root}/aop/target/lib/jboss-aop-single.jar"/>
+ <property name="aop.aspect-library50.location" value="${project.root}/aspects/target/jboss-aop-aspects.jar"/>
<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"/>
@@ -392,7 +392,7 @@
<!-- The JDK 5 libs -->
<copy todir="${project.release}/lib" file="${aop.50.location}"/>
<copy todir="${project.release}/lib" file="${aop.50.single.location}"/>
- <copy todir="${project.release}/lib" file="${project.root}/aop/output/lib/jboss-aop-client.jar"/>
+ <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}"/>
@@ -436,7 +436,7 @@
<copy todir="${project.release}/jboss-50-install" file="${aop.readme-as5.location}"/>
<copy tofile="${project.release}/jboss-50-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
<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 tofile="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/jboss-standalone-aspect-library.jar" file="${aop.aspect-library50.location}"/>
<copy todir="${project.release}" file="RELEASE_NOTES.html"/>
More information about the jboss-cvs-commits
mailing list