jtaylor 02/05/15 13:11:29
Modified: . build.xml
src/test-conf TestDiskCache.ccf TestDiskCacheCon.ccf
log4j.properties
Log:
Using the cool new maven callbacks to prepare the test config, NEED TO UPDATE
TO THE LATEST MAVEN FROM HEAD =]
Revision Changes Path
1.7 +159 -62 jakarta-turbine-jcs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 14 May 2002 17:44:39 -0000 1.6
+++ build.xml 15 May 2002 20:11:29 -0000 1.7
@@ -17,7 +17,7 @@
<!-- Make directory for log output from tests (distinct from reports) -->
- <mkdir dir="target/test/logs/jcs"/>
+ <mkdir dir="target/test-sandbox/logs/jcs"/>
<!-- Copy test config files to the test build dir -->
@@ -34,86 +34,183 @@
<target name="test" depends="maven:test"/>
<target name="jar" depends="maven:jar"/>
- <!-- maven:start -->
+ <!-- maven:start -->
+
<!-- ================================================================== -->
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
+
- <target
- name="maven:site">
- <ant antfile="${maven.home}/build-docs.xml" target="site"/>
- </target>
+ <target name="maven:gump-descriptor">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
+ </target>
- <target
- name="maven:jar" depends="jcs:test-prepare">
- <ant antfile="${maven.home}/build-maven.xml" target="jar"/>
- </target>
- <target
- name="maven:install-jar">
- <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
- </target>
+ <target name="maven:maven-update">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
+ </target>
- <target
- name="maven:env">
- <ant antfile="${maven.home}/build-maven.xml" target="env"/>
- </target>
- <target
- name="maven:docs">
- <ant antfile="${maven.home}/build-docs.xml" target="docs"/>
- </target>
+ <target name="maven:update-jars">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
+ </target>
- <target
- name="maven:test" depends="jcs:test-prepare">
- <ant antfile="${maven.home}/build-test.xml" target="test"/>
- </target>
- <target
- name="maven:run-singletest" depends="jcs:test-prepare">
- <ant antfile="${maven.home}/build-test.xml" target="run-singletest"/>
- </target>
+ <target name="maven:jar">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
+ </target>
- <target
- name="maven:clean">
- <ant antfile="${maven.home}/build-maven.xml" target="clean"/>
- </target>
- <target
- name="maven:metrics">
- <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/>
- </target>
+ <target name="maven:docs-quick">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
+ </target>
- <target
- name="maven:dist" depends="jcs:test-prepare">
- <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
- </target>
- <target
- name="maven:deploy-site">
- <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/>
- </target>
+ <target name="maven:run-singletest">
+ <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
+ </target>
- <target
- name="maven:gump-descriptor">
- <ant antfile="${maven.home}/build-maven.xml" target="gump-descriptor"/>
- </target>
- <target
- name="maven:javadocs">
- <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/>
- </target>
+ <target name="maven:compile">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
+ </target>
- <target
- name="maven:compile" depends="jcs:test-prepare">
- <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
- </target>
- <target
- name="maven:update-jars">
- <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/>
- </target>
+ <target name="maven:fo">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
+ </target>
+
+
+ <target name="maven:cvs-change-log">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
+ </target>
+
+
+ <target name="maven:war">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
+ </target>
+
+
+ <target name="maven:generate-reactor">
+ <ant antfile="${maven.home}/plugins/reactor/build.xml"
target="generate-reactor"/>
+ </target>
+
+
+ <target name="maven:cross-ref">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
+ </target>
+
+
+ <target name="maven:deploy-site">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
+ </target>
+
+
+ <target name="maven:ear">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
+ </target>
+
+
+ <target name="maven:install-jar">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
+ </target>
+
+
+ <target name="maven:task-list">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
+ </target>
+
+
+ <target name="maven:docs">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
+ </target>
+
+
+ <target name="maven:site">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
+ </target>
+
+
+ <target name="maven:deploy-dist">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
+ </target>
+
+
+ <target name="maven:javadocs">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
+ </target>
+
+
+ <target name="maven:announce">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
+ </target>
+
+
+ <target name="maven:check-source">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
+ </target>
+
+
+ <target name="maven:dist">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
+ </target>
+
+
+ <target name="maven:dist-build">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
+ </target>
+
+
+ <target name="maven:metrics">
+ <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
+ </target>
+
+
+ <target name="maven:clean">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
+ </target>
+
+
+ <target name="maven:env">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
+ </target>
+
+
+ <target name="maven:test">
+ <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
+ </target>
+
+
+ <target name="maven:pdf">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
+ </target>
+
+
+ <target name="maven:iutest">
+ <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
+ </target>
+
+
+ <target name="maven:activity-log">
+ <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
+ </target>
+
+
+ <target name="maven:verify-project">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
+ </target>
+
+
+ <target name="maven:validate-pom">
+ <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
+ </target>
+
+
+ <target name="maven:validate-war">
+ <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
+ </target>
+
<!-- maven:end -->
1.3 +2 -2 jakarta-turbine-jcs/src/test-conf/TestDiskCache.ccf
Index: TestDiskCache.ccf
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/test-conf/TestDiskCache.ccf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestDiskCache.ccf 14 May 2002 16:45:45 -0000 1.2
+++ TestDiskCache.ccf 15 May 2002 20:11:29 -0000 1.3
@@ -41,9 +41,9 @@
# Indexed Disk Cache
jcs.auxiliary.indexedDiskCache=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.indexedDiskCache.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.indexedDiskCache.attributes.DiskPath=bin/test/indexed-disk-cache
+jcs.auxiliary.indexedDiskCache.attributes.DiskPath=target/test-sandbox/indexed-disk-cache
# Indexed Disk Cache
jcs.auxiliary.indexedDiskCache2=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.indexedDiskCache2.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.indexedDiskCache2.attributes.DiskPath=bin/test/indexed-disk-cache2
+jcs.auxiliary.indexedDiskCache2.attributes.DiskPath=target/test-sandbox/indexed-disk-cache2
1.2 +1 -1 jakarta-turbine-jcs/src/test-conf/TestDiskCacheCon.ccf
Index: TestDiskCacheCon.ccf
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/test-conf/TestDiskCacheCon.ccf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDiskCacheCon.ccf 14 May 2002 20:44:27 -0000 1.1
+++ TestDiskCacheCon.ccf 15 May 2002 20:11:29 -0000 1.2
@@ -41,5 +41,5 @@
# Indexed Disk Cache
jcs.auxiliary.indexedDiskCache=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.indexedDiskCache.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
-jcs.auxiliary.indexedDiskCache.attributes.DiskPath=bin/test/indexed-disk-cache-conc
+jcs.auxiliary.indexedDiskCache.attributes.DiskPath=target/test-sandbox/indexed-disk-cache-conc
1.3 +1 -1 jakarta-turbine-jcs/src/test-conf/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/test-conf/log4j.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4j.properties 8 Apr 2002 14:27:38 -0000 1.2
+++ log4j.properties 15 May 2002 20:11:29 -0000 1.3
@@ -2,7 +2,7 @@
log4j.category.org.apache.jcs = DEBUG, jcs
log4j.appender.jcs = org.apache.log4j.FileAppender
-log4j.appender.jcs.file = target/test/logs/jcs.log
+log4j.appender.jcs.file = target/test-sandbox/logs/jcs.log
log4j.appender.jcs.layout = org.apache.log4j.PatternLayout
log4j.appender.jcs.layout.conversionPattern = %d [%t] %-5p %c - %m%n
log4j.appender.jcs.append = false
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
