mcconnell 2003/02/07 23:23:05
Modified: . build.bat build.xml james.xml
tests test.xml
tests/merlin james-block.xml kernel.xml
Log:
Updated build file in handle sar cleation.
Revision Changes Path
1.9 +18 -18 jakarta-james/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-james/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 25 Sep 2002 22:56:20 -0000 1.8
+++ build.bat 8 Feb 2003 07:23:04 -0000 1.9
@@ -1,18 +1,18 @@
-@echo off
-
-echo.
-echo James Build System
-echo -------------------
-
-set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools
-
-set OLD_CLASSPATH=%CLASSPATH%
-set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
-
-%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
-goto cleanup
-
-:cleanup
-set ANT_HOME=%OLD_ANT_HOME%
-set CLASSPATH=%OLD_CLASSPATH%
+@echo off
+
+echo.
+echo James Build System
+echo -------------------
+
+set OLD_ANT_HOME=%ANT_HOME%
+set ANT_HOME=tools
+
+set OLD_CLASSPATH=%CLASSPATH%
+set
CLASSPATH=phoenix-bin\lib\xercesImpl-2.0.2.jar;phoenix-bin\lib\xml-apis.jar;tools\lib\velocity-1.3-dev.jar;tools\lib\jdom-b7.jar
+
+%ANT_HOME%\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8
+goto cleanup
+
+:cleanup
+set ANT_HOME=%OLD_ANT_HOME%
+set CLASSPATH=%OLD_CLASSPATH%
1.122 +18 -2 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- build.xml 6 Feb 2003 06:36:16 -0000 1.121
+++ build.xml 8 Feb 2003 07:23:04 -0000 1.122
@@ -122,9 +122,14 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
<exclude name="xerces.jar"/>
+ <exclude name="cornerstone.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/candidates">
+ <include name="*.jar"/>
</fileset>
<fileset dir="${phoenix.lib.dir}">
<include name="*.jar"/>
+ <exclude name="excalibur-thead*.jar"/>
</fileset>
<pathelement path="${build.classes}"/>
</path>
@@ -394,11 +399,22 @@
<include name="mm.mysql-2.0.14.jar"/>
<include name="mm.mysql.LICENCE"/>
<include name="avalon-framework-4.1.3.jar"/>
- <include name="cornerstone.jar"/>
+ <!--<include name="cornerstone.jar"/>-->
<include name="excalibur-datasource-1.0.jar"/>
<include name="activation.jar"/>
<include name="mail_1_3.jar"/>
<include name="commons-net-1.0.0-dev.jar"/>
+ </lib>
+ <lib dir="lib/candidates">
+ <include name="excalibur-thread-1.1.jar"/>
+ <include name="excalibur-pool-1.2.jar"/>
+ <include name="commons-collections-2.1.jar"/>
+ <include name="cornerstone-threads-1.0.jar"/>
+ <include name="cornerstone-connection-1.0.jar"/>
+ <include name="cornerstone-store-1.0.jar"/>
+ <include name="cornerstone-scheduler-1.0.jar"/>
+ <include name="cornerstone-sockets-1.0.jar"/>
+ <include name="cornerstone-datasources-1.0.jar"/>
</lib>
<zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
1.5 +1 -1 jakarta-james/james.xml
Index: james.xml
===================================================================
RCS file: /home/cvs/jakarta-james/james.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- james.xml 8 Feb 2003 06:23:33 -0000 1.4
+++ james.xml 8 Feb 2003 07:23:04 -0000 1.5
@@ -108,7 +108,7 @@
<mkdir dir="${build.lib}"/>
<mkdir dir="${build.gen}"/>
- <jar jarfile="${build.lib}/${name}-${package-version}.jar"
+ <jar jarfile="${build.lib}/${name}.jar"
basedir="${build.classes}" includes="org/apache/james/**" >
<fileset dir="${java.dir}">
1.2 +1 -1 jakarta-james/tests/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-james/tests/test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.xml 8 Feb 2003 05:50:38 -0000 1.1
+++ test.xml 8 Feb 2003 07:23:05 -0000 1.2
@@ -67,7 +67,7 @@
<pathelement path="${java.class.path}" />
<fileset dir="../build/lib">
- <include name="james-3.0.jar"/>
+ <include name="james.jar"/>
<include name="mailet.jar"/>
</fileset>
1.2 +1 -1 jakarta-james/tests/merlin/james-block.xml
Index: james-block.xml
===================================================================
RCS file: /home/cvs/jakarta-james/tests/merlin/james-block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- james-block.xml 8 Feb 2003 05:22:29 -0000 1.1
+++ james-block.xml 8 Feb 2003 07:23:05 -0000 1.2
@@ -51,7 +51,7 @@
</fileset>
<fileset dir="../build/lib">
<include name="mailet.jar"/>
- <include name="james-3.0.jar"/>
+ <include name="james.jar"/>
</fileset>
</classpath>
</engine>
1.3 +2 -1 jakarta-james/tests/merlin/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/jakarta-james/tests/merlin/kernel.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel.xml 8 Feb 2003 05:58:15 -0000 1.2
+++ kernel.xml 8 Feb 2003 07:23:05 -0000 1.3
@@ -5,9 +5,10 @@
<!--
To log to a file, change "default" to "kernel".
+ To log to screen, change "kernel" to "default".
-->
- <logging target="default" priority="WARN">
+ <logging target="kernel" priority="WARN">
<category name="/sys/logger" priority="WARN"/>
<target name="kernel">
<file location="kernel.log" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
