mcconnell 2003/08/24 06:51:12
Modified: . build.bat build.xml include.properties
Added: lib commons-dbcp-1.0.jar
lib/candidates cornerstone-connection-api-1.0.jar
cornerstone-connection-impl-1.0.jar
cornerstone-datasources-api-1.0.jar
cornerstone-datasources-impl-1.0.jar
cornerstone-scheduler-api-1.0.jar
cornerstone-scheduler-impl-1.0.jar
cornerstone-sockets-api-1.0.jar
cornerstone-sockets-impl-1.0.jar
cornerstone-store-api-1.0.jar
cornerstone-store-impl-1.0.jar
cornerstone-threads-api-1.0.jar
cornerstone-threads-impl-1.0.jar
excalibur-thread-1.1.1.jar
Removed: lib/candidates cornerstone-connection-1.0.jar
cornerstone-datasources-1.0.jar
cornerstone-scheduler-1.0.jar
cornerstone-sockets-1.0.jar
cornerstone-store-1.0.jar
cornerstone-threads-1.0.jar
excalibur-thread-1.1.jar
Log:
Update to latest cornerstone candidates (in lib/candidates) and added 1.0 version of
commons dbcp to the lib directory.
Revision Changes Path
1.11 +18 -18 james-server/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/james-server/build.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.bat 17 Feb 2003 13:09:31 -0000 1.10
+++ build.bat 24 Aug 2003 13:51:12 -0000 1.11
@@ -1,18 +1,18 @@
[EMAIL PROTECTED] 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%
[EMAIL PROTECTED] 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.135 +29 -16 james-server/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/james-server/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 26 Jul 2003 00:17:21 -0000 1.134
+++ build.xml 24 Aug 2003 13:51:12 -0000 1.135
@@ -48,6 +48,7 @@
<pathelement location="${dns.jar}"/>
<pathelement location="${commons-net.jar}"/>
<pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${jakarta-oro.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-threadcontext.jar}"/>
@@ -56,12 +57,18 @@
<pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${excalibur-datasource.jar}"/>
<pathelement location="${excalibur-io.jar}"/>
- <pathelement location="${cornerstone-threads.jar}"/>
- <pathelement location="${cornerstone-connection.jar}"/>
- <pathelement location="${cornerstone-store.jar}"/>
- <pathelement location="${cornerstone-scheduler.jar}"/>
- <pathelement location="${cornerstone-sockets.jar}"/>
- <pathelement location="${cornerstone-datasources.jar}"/>
+ <pathelement location="${cornerstone-threads-api.jar}"/>
+ <pathelement location="${cornerstone-threads-impl.jar}"/>
+ <pathelement location="${cornerstone-connection-api.jar}"/>
+ <pathelement location="${cornerstone-connection-impl.jar}"/>
+ <pathelement location="${cornerstone-store-api.jar}"/>
+ <pathelement location="${cornerstone-store-impl.jar}"/>
+ <pathelement location="${cornerstone-scheduler-api.jar}"/>
+ <pathelement location="${cornerstone-scheduler-impl.jar}"/>
+ <pathelement location="${cornerstone-sockets-api.jar}"/>
+ <pathelement location="${cornerstone-sockets-impl.jar}"/>
+ <pathelement location="${cornerstone-datasources-api.jar}"/>
+ <pathelement location="${cornerstone-datasources-impl.jar}"/>
<pathelement location="${javax-mail.jar}"/>
<pathelement location="${javax-activation.jar}"/>
<pathelement path="${java.class.path}" />
@@ -385,14 +392,14 @@
<echo message="Making Mailet API Jar (mailet-api-${mailet-api-version}.jar)"/>
<jar jarfile="${build.lib}/mailet-api-${mailet-api-version}.jar"
basedir="${build.classes}"
-
includes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User"/>
+
includes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User,org/apache/mailet/MailetException"/>
<!-- Make mailet implementation jar-->
<echo message="Making Mailet Jar (mailet-${mailet-version}.jar)"/>
<jar jarfile="${build.lib}/mailet-${mailet-version}.jar"
basedir="${build.classes}"
includes="org/apache/mailet/**"
-
excludes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User"/>
+
excludes="org/apache/mailet/Mailet.class,org/apache/mailet/MailetConfig.class,org/apache/mailet/Mail.class,org/apache/mailet/MailetContext.class,org/apache/mailet/MailAddress.class,org/apache/mailet/MailRepository,org/apache/mailet/SpoolRepository,org/apache/mailet/UserRepository,org/apache/mailet/Datasource,org/apache/mailet/User,org/apache/mailet/MailetException"/>
<!-- Make james jar-->
<echo message="Making James Jar (james-${version}.jar)"/>
@@ -433,15 +440,21 @@
<include name="commons-net-1.0.0-dev.jar"/>
</lib>
<lib dir="lib/candidates">
- <!--<include name="excalibur-thread-1.1.jar"/>-->
+ <include name="excalibur-thread-1.1.1.jar"/> <!-- check -->
<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"/>
+ <include name="cornerstone-threads-api-1.0.jar"/>
+ <include name="cornerstone-threads-impl-1.0.jar"/>
+ <include name="cornerstone-connection-api-1.0.jar"/>
+ <include name="cornerstone-connection-impl-1.0.jar"/>
+ <include name="cornerstone-store-api-1.0.jar"/>
+ <include name="cornerstone-store-impl-1.0.jar"/>
+ <include name="cornerstone-scheduler-api-1.0.jar"/>
+ <include name="cornerstone-scheduler-impl-1.0.jar"/>
+ <include name="cornerstone-sockets-api-1.0.jar"/>
+ <include name="cornerstone-sockets-impl-1.0.jar"/>
+ <include name="cornerstone-datasources-api-1.0.jar"/>
+ <include name="cornerstone-datasources-impl-1.0.jar"/>
</lib>
<zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
1.4 +16 -14 james-server/include.properties
Index: include.properties
===================================================================
RCS file: /home/cvs/james-server/include.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- include.properties 28 Apr 2003 11:53:30 -0000 1.3
+++ include.properties 24 Aug 2003 13:51:12 -0000 1.4
@@ -62,38 +62,40 @@
# ----- DNS -----
dns.jar=${lib.dir}/dnsjava-1.3.2.jar
-# ----- Commons Net -----
+# ----- Commons -----
commons-net.jar=${lib.dir}/commons-net-1.0.0-dev.jar
+commons-dbcp.jar=${lib.dir}/commons-dbcp-1.0.jar
+commons-collections.jar=${candidates.dir}/commons-collections-2.1.jar
# ----- Jakarta ORO -----
jakarta-oro.jar=${lib.dir}/jakarta-oro-2.0.1.jar
-
-# ----- From lib/candidates
-
-# ----- Commons Collections -----
-commons-collections.jar=${candidates.dir}/commons-collections-2.1.jar
-
# ----- Cornerstone threads, version 1.0 or later -----
-cornerstone-threads.jar=${candidates.dir}/cornerstone-threads-1.0.jar
+cornerstone-threads-api.jar=${candidates.dir}/cornerstone-threads-api-1.0.jar
+cornerstone-threads-impl.jar=${candidates.dir}/cornerstone-threads-impl-1.0.jar
# ----- Cornerstone connection, version 1.0 or later -----
-cornerstone-connection.jar=${candidates.dir}/cornerstone-connection-1.0.jar
+cornerstone-connection-api.jar=${candidates.dir}/cornerstone-connection-api-1.0.jar
+cornerstone-connection-impl.jar=${candidates.dir}/cornerstone-connection-impl-1.0.jar
# ----- Cornerstone masterstore, version 1.0 or later -----
-cornerstone-store.jar=${candidates.dir}/cornerstone-store-1.0.jar
+cornerstone-store-api.jar=${candidates.dir}/cornerstone-store-api-1.0.jar
+cornerstone-store-impl.jar=${candidates.dir}/cornerstone-store-impl-1.0.jar
# ----- Cornerstone sockets, version 1.0 or later -----
-cornerstone-sockets.jar=${candidates.dir}/cornerstone-sockets-1.0.jar
+cornerstone-sockets-api.jar=${candidates.dir}/cornerstone-sockets-api-1.0.jar
+cornerstone-sockets-impl.jar=${candidates.dir}/cornerstone-sockets-impl-1.0.jar
# ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-scheduler.jar=${candidates.dir}/cornerstone-scheduler-1.0.jar
+cornerstone-scheduler-api.jar=${candidates.dir}/cornerstone-scheduler-api-1.0.jar
+cornerstone-scheduler-impl.jar=${candidates.dir}/cornerstone-scheduler-impl-1.0.jar
# ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-datasources.jar=${candidates.dir}/cornerstone-datasources-1.0.jar
+cornerstone-datasources-api.jar=${candidates.dir}/cornerstone-datasources-api-1.0.jar
+cornerstone-datasources-impl.jar=${candidates.dir}/cornerstone-datasources-impl-1.0.jar
# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.jar=${candidates.dir}/excalibur-thread-1.1.jar
+excalibur-thread.jar=${candidates.dir}/excalibur-thread-1.1.1.jar
# ----- Excalibur pool -----
excalibur-pool.jar=${candidates.dir}/excalibur-pool-1.2.jar
1.1 james-server/lib/commons-dbcp-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-connection-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-connection-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-datasources-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-datasources-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-scheduler-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-scheduler-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-sockets-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-sockets-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-store-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-store-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-threads-api-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/cornerstone-threads-impl-1.0.jar
<<Binary file>>
1.1 james-server/lib/candidates/excalibur-thread-1.1.1.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
