[jboss-cvs] JBossCache ...
Ben Wang
bwang at jboss.com
Sun Sep 24 05:36:28 EDT 2006
User: bwang
Date: 06/09/24 05:36:28
Modified: JBossCache build.xml
Log:
upd
Revision Changes Path
1.139 +25 -30 JBossCache/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/build.xml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- build.xml 23 Sep 2006 13:15:43 -0000 1.138
+++ build.xml 24 Sep 2006 09:36:28 -0000 1.139
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.138 2006/09/23 13:15:43 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.139 2006/09/24 09:36:28 bwang Exp $ -->
<project default="compile" name="JBossCache">
@@ -25,7 +25,6 @@
<property name="tmp.dir" value="${root.dir}/tmp"/>
<property name="output.dir" value="${root.dir}/output"/>
<property name="output.etc.dir" value="${output.dir}/etc"/>
- <property name="output.resources.dir" value="${output.etc.dir}"/>
<property name="output.interop.dir" value="${output.dir}/interop"/>
<property name="compile.dir" value="${output.dir}/classes"/>
<property name="compiletest.dir" value="${output.dir}/test-classes"/>
@@ -193,7 +192,7 @@
<src path="${compile.dir}"/>
<include name="org/jboss/cache/pojo/impl/*.class"/>
<include name="org/jboss/cache/pojo/collection/*.class"/>
- <aoppath path="${output.resources.dir}/jboss-aop.xml"/>
+ <aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
<classpath>
<path refid="output.classpath"/>
</classpath>
@@ -273,10 +272,6 @@
<fileset dir="${etc.dir}">
<include name="${dependencies}"/>
</fileset>
- <!--
- <fileset dir="${output.resources.dir}">
- <include name="jboss-aop.xml"/>
- </fileset> -->
</jar>
</target>
@@ -388,7 +383,7 @@
<target name="one-test-aop" depends="generateClassLoader, compile,unittests-init"
description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
- <jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
<!-- start of Optimizeit support
sample script
@@ -423,12 +418,12 @@
<target name="one-test-aop50" depends="compile, unittests-init" description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
- <jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<!--
<jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
-->
<jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
- <classpath refid="output.classpath.50"/>
+ <classpath refid="output.classpath"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -439,7 +434,7 @@
<target name="one-test-aop50WithAopC" depends="compile, aopc50, unittests-init"
description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
- <classpath refid="output.classpath.50"/>
+ <classpath refid="output.classpath"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -495,12 +490,12 @@
<aopc compilerclasspathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/aop/test"/>
<src path="${compiletest.dir}/org/jboss/cache/data"/>
- <aoppath path="${output.resources.dir}/jboss-aop.xml"/>
+ <aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
<classpath refid="output.classpath"/>
</aopc>
<aopc compilerclasspathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/aop/test/propagation/impl"/>
- <aoppath path="${output.resources.dir}/jboss-aop.xml"/>
+ <aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
<classpath refid="output.classpath"/>
</aopc>
</target>
@@ -509,7 +504,7 @@
<target name="aopc" depends="compile" description="Precompile aop test classes">
<aopc compilerclasspathref="library.classpath" classpathref="library.classpath" verbose="true">
<src path="${compiletest.dir}/org/jboss/cache/aop/test"/>
- <aoppath path="${output.etc.dir}/jboss-aop.xml"/>
+ <aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
<classpath>
<path refid="output.classpath"/>
</classpath>
@@ -519,17 +514,17 @@
<!-- pre-compile directory with aopc50 -->
<target name="aopc50" depends="compile" description="Precompile aop test classes">
<aopc compilerclasspathref="library.classpath" classpathref="library.classpath" verbose="true">
- <src path="${compiletest.dir.50}/org/jboss/cache/aop/test"/>
- <!--src path="${compiletest.dir.50}/org/jboss/cache/data"/-->
- <aoppath path="${output.resources.dir}/jboss-aop.xml"/>
+ <src path="${compiletest.dir}/org/jboss/cache/pojo/test"/>
+ <!--src path="${compiletest.dir}/org/jboss/cache/data"/-->
+ <aoppath path="${output.resources.dir}/pojocache-aop.xml"/>
<classpath>
- <path refid="output.classpath.50"/>
+ <path refid="output.classpath"/>
</classpath>
</aopc>
</target>
<target name="functionaltests" depends="compile,test-jar,unittests-init"
- description="Runs all non-AOP functional tests">
+ description="Runs all core Cache functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="256m">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
@@ -553,7 +548,7 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
@@ -572,7 +567,7 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
@@ -589,9 +584,9 @@
description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
- <classpath refid="output.classpath.50"/>
+ <classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
@@ -610,9 +605,9 @@
<target name="functionalAopTests50" depends="compile, unittests-init" description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
- <jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
- <classpath refid="output.classpath.50"/>
+ <classpath refid="output.classpath"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
@@ -634,7 +629,7 @@
<target name="functionalPojoCacheTests" depends="compile, unittests-init"
description="Runs all PojoCache2.x functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
- <jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
<classpath refid="output.classpath"/>
<classpath refid="library.classpath"/>
@@ -682,7 +677,7 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
@@ -700,7 +695,7 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
@@ -717,7 +712,7 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
- <jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
+ <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
@@ -967,7 +962,7 @@
<copy todir="${tmp.dir}/resources" filtering="no">
<fileset dir="${resources.dir}">
- <include name="jboss-aop.xml"/>
+ <include name="pojocache-aop.xml"/>
</fileset>
</copy>
More information about the jboss-cvs-commits
mailing list