You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/05/26 11:07:35 UTC
cvs commit: jakarta-slide build.xml build.properties.sample
ozeigermann 2004/05/26 02:07:35
Modified: . build.xml build.properties.sample
Log:
- Make Oracle dependency optional
- Reflect jdk14 logger move
Revision Changes Path
1.208 +9 -3 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- build.xml 4 May 2004 10:33:58 -0000 1.207
+++ build.xml 26 May 2004 09:07:35 -0000 1.208
@@ -113,6 +113,7 @@
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${lucene.jar}"/>
+ <pathelement location="${oracle-jdbc.jar}"/>
</path>
<path id="wrappers.classpath">
<pathelement location="${slide.build}/classes"/>
@@ -140,6 +141,7 @@
<available property="dom.present" classname="org.w3c.dom.Document" classpath="${xmlapi.jar}"/>
<available property="sax.present" classname="org.xml.sax.helpers.DefaultHandler" classpath="${xmlapi.jar}"/>
<available property="catalina.present" classname="org.apache.catalina.User" classpath="${catalina.jar}"/>
+ <available property="oracle.present" classname="oracle.sql.BLOB" classpath="${oracle-jdbc.jar}"/>
<condition property="jvm14.present">
<equals arg1="${ant.java.version}" arg2="1.4"/>
</condition>
@@ -168,9 +170,12 @@
<echo message=" XML DOM Level 2 API ${dom.present}"/>
<echo message=" XML SAX 2 API ${sax.present}"/>
<echo message=""/>
+ <echo message="Optional Libraries:"/>
+ <echo message=" Oracle JDBC driver ${oracle.present}"/>
+ <echo message=""/>
<echo message="Optional Tomcat bundle:"/>
- <echo message=" Tomcat (4.1.x or 5.0.x) ${catalina.dist}"/>
- <echo message=" Present ${catalina.present}"/>
+ <echo message=" Tomcat (4.1.x or 5.0.x) ${catalina.dist}"/>
+ <echo message=" Present ${catalina.present}"/>
<echo message=""/>
<condition property="required.present">
<and>
@@ -241,6 +246,7 @@
<echo message="Building Standard Stores"/>
<javac srcdir="src/stores" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
<classpath refid="stores.classpath"/>
+ <exclude name="**/OracleRDBMSAdapter**" unless="oracle.present"/>
</javac>
<echo message="Building Default Roles"/>
<javac srcdir="src/roles" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
@@ -268,7 +274,7 @@
<!-- This target requires JDK1.4 -->
<!-- =================================================================== -->
<target name="jdk14-logging" depends="main" if="jvm14.present">
- <javac srcdir="proposals/jdk14/src" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
+ <javac srcdir="src/jdk14" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
<classpath refid="wrappers.classpath"/>
</javac>
<copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
1.21 +5 -1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.properties.sample 14 Jan 2004 16:06:41 -0000 1.20
+++ build.properties.sample 26 May 2004 09:07:35 -0000 1.21
@@ -47,3 +47,7 @@
catalina.jar=${catalina.server.lib}/catalina.jar
jmx.jar=${catalina.common.lib}/jmx.jar
+# ----- Oracle JDBC driver -----
+
+oracle.lib.dir=
+oracle-jdbc.jar=${oracle.lib.dir}/ojdbc14.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org