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/01/13 15:44:02 UTC
cvs commit: jakarta-slide build.properties.sample build.xml
ozeigermann 2004/01/13 06:44:02
Modified: . build.properties.sample build.xml
Added: lib jdom-dev-20030322.jar commons-pool-1.1.jar
commons-dbcp-20031203.jar log4j-1.2.8.jar
geronimo-jta.jar commons-collections-2.1.jar
servlet-2.3.jar
Removed: lib commons-pool.jar commons-httpclient.jar
commons-modeler.jar jdom-dev.jar
commons-collections.jar commons-logging.jar
commons-dbcp.jar
Log:
- all necessary jars to build Slide with JDK 1.4 are now in the lib dir
- adapted build.xml and build.properties to this
- removed unused targets from build.xml and build.properties
Revision Changes Path
1.1 jakarta-slide/lib/jdom-dev-20030322.jar
<<Binary file>>
1.1 jakarta-slide/lib/commons-pool-1.1.jar
<<Binary file>>
1.1 jakarta-slide/lib/commons-dbcp-20031203.jar
<<Binary file>>
1.1 jakarta-slide/lib/log4j-1.2.8.jar
<<Binary file>>
1.1 jakarta-slide/lib/geronimo-jta.jar
<<Binary file>>
1.1 jakarta-slide/lib/commons-collections-2.1.jar
<<Binary file>>
1.1 jakarta-slide/lib/servlet-2.3.jar
<<Binary file>>
1.19 +8 -135 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.properties.sample 12 Jan 2004 11:36:13 -0000 1.18
+++ build.properties.sample 13 Jan 2004 14:44:01 -0000 1.19
@@ -33,141 +33,14 @@
# EXTERNAL DEPENDENCIES
# -------------------------------------------------------------------
-
-# ----- Default Base Path for Dependent Packages -----
-cvs.home=..
-#base.path=/java/jakarta-slide
-base.path=.
-
-
-# [REQUIRED]
-
-
-# ----- JAXP 1.1 compliant XML Parser -----
-#jaxp.home=${cvs.home}/jaxp-1.1
-#jaxp.lib=${base.path}/lib
+# ----- JAXP 1.2 compliant XML Parser -----
+#jaxp.home=
#jaxp.lib=${jaxp.home}/lib
+#xmlapi.jar=${jaxp.lib}/crimson.jar
+#xmlparser.jar=${jaxp.lib}/crimson.jar
#jaxp.jar=${jaxp.lib}/jaxp.jar
-#jaxp.parser.jar=${jaxp.lib}/crimson.jar
-
-
-# ----- JAXP 1.2 compliant XML Parser -----
-#jaxp.home=${cvs.home}/jaxp-1.2
-#jaxp.lib=${base.path}/lib
-#jaxp.lib=${jaxp.home}
-#jaxp.jar=${jaxp.lib}/jaxp-api.jar
-#jaxp.parser.jar=${jaxp.lib}/xalan.jar
-
-
-# ----- JUnit, version 3.7 or later -----
-#junit.home=${cvs.home}/junit3.7
-#junit.lib=${base.path}/lib
-#junit.lib=${junit.home}/lib
-#junit.jar=${junit.lib}/junit.jar
-
-
-# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
-#servlet.home=${cvs.home}/servlet-2_2b
-#servlet.home=${cvs.home}/jakarta-servletapi-4
-#servlet.home=${cvs.home}/jakarta-servletapi-5
-#servlet.lib=${base.path}/lib
-#servlet.lib=${servlet.home}/lib
-#servlet.jar=${servlet.lib}/servlet.jar
-
-
-# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-#jta.home=${cvs.home}/jta-spec1_0_1
-#jta.lib=${base.path}/lib
-#jta.lib=${jta.home}/lib
-#jta.jar=${jta.lib}/jta-spec1_0_1.jar
-#jta.jar=${jta.lib}/jta.jar
-
-
-# ----- JDOM, version 1.0 b7 or later -----
-#jdom.home=${cvs.home}/jdom-b7
-jdom.lib=${base.path}/lib
-#jdom.lib=${jdom.home}/build
-#jdom.jar=${jdom.lib}/jdom-dev.jar
-
-
-# [OPTIONAL]
-
# ----- Catalina distribution directory -----
-#catalina.dist=${cvs.home}/jakarta-tomcat-4.1
-#catalina.dist=${cvs.home}/jakarta-tomcat-4.1.3
-#catalina.dist=${cvs.home}/jakarta-tomcat-5
-
-# ----- Commons DBCP, version 20011030 or later -----
-#commons-dbcp.home=${cvs.home}/commons-dbcp
-commons-dbcp.lib=${base.path}/lib
-#commons-dbcp.lib=${commons-dbcp.home}
-#commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
-
-
-# ----- Commons Modeler, version 20020117 or later -----
-#commons-modeler.home=${cvs.home}/commons-modeler
-commons-modeler.lib=${base.path}/lib
-#commons-modeler.lib=${commons-modeler.home}
-#commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
-
-
-# ----- Commons Pool, version 20011030 or later -----
-#commons-pool.home=${cvs.home}/commons-pool
-commons-pool.lib=${base.path}/lib
-#commons-pool.lib=${commons-pool.home}/lib
-#commons-pool.jar=${commons-pool.lib}/commons-pool.jar
-
-
-# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
-#jdbc20ext.home=${cvs.home}/jdbc2_0-stdext
-#jdbc20ext.lib=${base.path}/lib
-#jdbc20ext.lib=${jdbc20ext.home}
-#jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
-
-
-# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.0 or later -----
-#jmx.home=${cvs.home}/mx4j-1.0
-#jmx.home=${cvs.home}/jmx_1.1_ri_bin
-#jmx.lib=${base.path}/lib
-#jmx.lib=${jmx.home}/lib
-#jmx.jar=${jmx.lib}/mx4j.jar
-#jmx.jar=${jmx.lib}/jmxri.jar
-
-
-# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
-#jndi.home=${cvs.home}/jndi-1.2.1
-#jndi.lib=${base.path}/lib
-#jndi.lib=${jndi.home}/lib
-#jndi.jar=${jndi.lib}/jndi.jar
-
-
-# ----- log4j (http://jakarta.apache.org/log4j/) -----
-#log4j.home=${cvs.home}/jakarta-log4j-1.1.3
-#log4j.home=${cvs.home}/jakarta-log4j-1.2.4
-#log4j.lib=${base.path}/lib
-#log4j.lib=${log4j.home}/dist/lib
-#log4j.jar=${log4j.lib}/log4j-1.2.4.jar
-#log4j.jar=${log4j.lib}/log4j.jar
-
-
-# ----- Struts, version 1.0.1 or later -----
-#struts.home=${cvs.home}/jakarta-struts-1.0.1
-#struts.lib=${base.path}/lib
-#struts.lib=${struts.home}/lib
-#struts.jar=${struts.lib}/struts.jar
-
-
-# ----- JSP Standard Tag Library, version 1.0 or later -----
-#jstl.home=${cvs.home}/jstl-1.0
-#jstl.lib=${base.path}/lib
-#jstl.lib=${jstl.home}/lib
-#jstl.jar=${jstl.lib}/jstl.jar
-
-
-# ----- Jakarta Taglibs Standard, version 1.0 or later -----
-#taglibs-standard.home=${cvs.home}/jakarta-taglibs/standard
-#taglibs-standard.lib=${base.path}/lib
-#taglibs-standard.lib=${taglibs-standard.home}/lib
-#taglibs-standard.jar=${taglibs-standard.lib}/standard.jar
-
+#catalina.dist=
+catalina.server.lib=${catalina.dist}/server/lib
+catalina.jar=${catalina.server.lib}/catalina.jar
1.188 +74 -316 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- build.xml 12 Jan 2004 13:35:21 -0000 1.187
+++ build.xml 13 Jan 2004 14:44:01 -0000 1.188
@@ -13,7 +13,6 @@
<property name="compile.deprecation" value="true"/>
<!-- Should Java compilations set the 'optimize' compiler option? -->
<property name="compile.optimize" value="true"/>
- <property name="build.compiler" value="classic"/>
<!-- =================================================================== -->
<!-- Project Properties -->
<!-- =================================================================== -->
@@ -27,46 +26,29 @@
<!-- =================================================================== -->
<!-- Dependencies Properties -->
<!-- =================================================================== -->
- <property name="servlet.lib" value="./lib"/>
- <property name="servlet.jar" value="${servlet.lib}/servlet.jar"/>
- <property name="jdom.lib" value="./lib"/>
- <property name="jdom.jar" value="${jdom.lib}/jdom-dev.jar"/>
- <property name="jaxp.lib" value="./lib"/>
- <property name="xmlapi.jar" value="${jaxp.lib}/crimson.jar"/>
- <property name="xmlparser.jar" value="${jaxp.lib}/crimson.jar"/>
- <property name="jaxp.jar" value="${jaxp.lib}/jaxp.jar"/>
- <property name="ant.lib" value="../ant/lib"/>
- <property name="ant.jar" value="${ant.lib}/ant.jar"/>
- <property name="junit.lib" value="./lib"/>
- <property name="junit.jar" value="${junit.lib}/junit.jar"/>
- <property name="jta.lib" value="./lib"/>
- <property name="jta.jar" value="${jta.lib}/jta.jar"/>
- <property name="jdbc20ext.lib" value="./lib"/>
- <property name="jdbc20ext.jar" value="${jdbc20ext.lib}/jdbc2_0-stdext.jar"/>
- <property name="log4j.lib" value="./lib"/>
- <property name="log4j.jar" value="${log4j.lib}/log4j.jar"/>
- <property name="antlr.jar" value="./lib/antlr.jar"/>
- <property name="antlr-tools.jar" value="./lib/antlr-tools.jar"/>
- <property name="commons-dbcp.lib" value="./lib"/>
- <property name="commons-dbcp.jar" value="${commons-dbcp.lib}/commons-dbcp.jar"/>
- <property name="commons-pool.lib" value="./lib"/>
- <property name="commons-pool.jar" value="${commons-pool.lib}/commons-pool.jar"/>
- <property name="commons-modeler.lib" value="./lib"/>
- <property name="commons-modeler.jar" value="${commons-pool.lib}/commons-modeler.jar"/>
- <property name="catalina.dist" value="../jakarta-tomcat-4.0/dist"/>
- <property name="naming.jar" value="${catalina.dist}/common/lib/naming-common.jar"/>
- <property name="resources.jar" value="${catalina.dist}/common/lib/naming-resources.jar"/>
- <property name="catalina.jar" value="${catalina.dist}/server/lib/catalina.jar"/>
- <property name="commons-httpclient.jar" value="lib/commons-httpclient.jar"/>
- <property name="commons-logging.jar" value="lib/commons-logging.jar"/>
- <property name="commons-collections.jar" value="lib/commons-collections.jar"/>
+ <property name="lib.dir" value="./lib"/>
+ <property name="servlet.jar" value="servlet-2.3.jar"/>
+ <property name="jdom.jar" value="jdom-dev-20030322.jar"/>
+ <property name="jta.jar" value="geronimo-jta.jar"/>
+ <property name="log4j.jar" value="log4j-1.2.8.jar"/>
+ <property name="commons-dbcp.jar" value="commons-dbcp-20031203.jar"/>
+ <property name="commons-pool.jar" value="commons-pool-1.1.jar"/>
+ <property name="commons-collections.jar" value="commons-collections-2.1.jar"/>
+
+ <property name="slide-kernel.jar" value="slide-kernel-${version}.jar"/>
+ <property name="slide-stores.jar" value="slide-stores-${version}.jar"/>
+ <property name="slide-roles.jar" value="slide-roles-${version}.jar"/>
+ <property name="slide-webdavservlet.jar" value="slide-webdavservlet-${version}.jar"/>
+
+ <property name="slide-catalinawrapper.jar" value="slide-catalinawrapper-${version}.jar"/>
+ <property name="slide-log4jwrapper.jar" value="slide-log4jwrapper-${version}.jar"/>
+ <property name="slide-jdk14logger.jar" value="slide-jdk14logger-${version}.jar"/>
+
<!-- =================================================================== -->
<!-- Build Properties -->
<!-- =================================================================== -->
<property name="slide.build" value="./build"/>
<property name="slide.dist" value="./dist"/>
- <property name="webdavclient.build" value="${slide.build}/client"/>
- <property name="webdavclient.dist" value="${slide.dist}/client"/>
<property name="testsuite.dist" value="${slide.dist}/webdav-testsuite"/>
<property name="webapp.dist" value="${slide.dist}/slide/webapp"/>
<property name="slide.archive" value="./${final.name}"/>
@@ -105,100 +87,42 @@
<path id="main.classpath">
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jaxp.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${lib.dir}/${jta.jar}"/>
+ <pathelement location="${lib.dir}/${jdom.jar}"/>
+ <pathelement location="${lib.dir}/${commons-collections.jar}"/>
</path>
<path id="stores.classpath">
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jaxp.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${jdbc20ext.jar}"/>
+ <pathelement location="${lib.dir}/${jta.jar}"/>
+ <pathelement location="${lib.dir}/${jdom.jar}"/>
<pathelement location="${slide.build}/classes"/>
- <pathelement location="${commons-dbcp.jar}"/>
- <pathelement location="${commons-pool.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${lib.dir}/${commons-dbcp.jar}"/>
+ <pathelement location="${lib.dir}/${commons-pool.jar}"/>
</path>
<path id="wrappers.classpath">
- <pathelement location="${jta.jar}"/>
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${xmlapi.jar}"/>
<pathelement location="${slide.build}/classes"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${resources.jar}"/>
- <pathelement location="${naming.jar}"/>
+ <pathelement location="${lib.dir}/${log4j.jar}"/>
<pathelement location="${catalina.jar}"/>
- <pathelement location="${commons-modeler.jar}"/>
</path>
<path id="webdavservlet.classpath">
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jaxp.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${slide.build}/classes"/>
- </path>
- <path id="webdavclient.classpath">
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${xmlapi.jar}"/>
- <pathelement location="${ant.jar}"/>
- <pathelement location="${commons-httpclient.jar}"/>
+ <pathelement location="${lib.dir}/${servlet.jar}"/>
+ <pathelement location="${lib.dir}/${jdom.jar}"/>
+ <pathelement location="${lib.dir}/${jta.jar}"/>
<pathelement location="${slide.build}/classes"/>
- <pathelement location="${antlr.jar}"/>
- <pathelement location="${antlr-tools.jar}"/>
</path>
<!-- =================================================================== -->
- <!-- Test Execution Defaults -->
- <!-- =================================================================== -->
- <path id="test.classpath">
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${xmlapi.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${commons-httpclient.jar}"/>
- <pathelement location="${webdavclient.build}/classes"/>
- <pathelement location="${slide.build}/classes"/>
- <pathelement location="${slide.build}/tests"/>
- </path>
- <!-- Should all tests fail if one does? -->
- <property name="test.failonerror" value="true"/>
- <!-- The test runner to execute -->
- <property name="test.runner" value="junit.textui.TestRunner"/>
- <!-- =================================================================== -->
<!-- Detect -->
<!-- =================================================================== -->
<target name="detect" depends="detect.display,detect.fail" description="Display configuration and conditional compilation flags">
</target>
<target name="detect.display">
- <available property="servlet.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}"/>
- <available property="servlet23.present" classname="javax.servlet.Filter" classpath="${servlet.jar}"/>
- <available property="jaxp10.present" classname="javax.xml.parsers.DocumentBuilder" classpath="${jaxp.jar}"/>
- <available property="jaxp11.present" classname="javax.xml.transform.TransformerFactory" classpath="${jaxp.jar}"/>
+ <available property="jaxp.present" classname="javax.xml.transform.TransformerFactory" classpath="${jaxp.jar}"/>
<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="jta.present" classname="javax.transaction.UserTransaction" classpath="${jta.jar}"/>
- <available property="modeler.present" classname="org.apache.commons.modeler.Registry" classpath="${commons-modeler.jar}"/>
- <available property="antlr.present" classname="antlr.Parser" classpath="${antlr.jar}"/>
- <available property="antlr-tools.present" classname="antlr.Tool" classpath="${antlr-tools.jar}"/>
- <available property="httpclient.present" classname="org.apache.commons.httpclient.HttpClient" classpath="${commons-httpclient.jar}"/>
- <available property="avalon.present" classname="org.apache.avalon.blocks.Block"/>
- <available property="junit.present" classname="junit.framework.TestCase" classpath="${junit.jar}"/>
- <available property="log4j.present" classname="org.apache.log4j.Category" classpath="${log4j.jar}"/>
<available property="catalina.present" classname="org.apache.catalina.User" classpath="${catalina.jar}"/>
- <available property="catalina.crimson.present" file="crimson.jar" filepath="${catalina.dist}/server/lib"/>
- <available property="catalina.jaxp.present" file="jaxp.jar" filepath="${catalina.dist}/server/lib"/>
- <available property="xsl.present" classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison"/>
- <available property="jdom.present" classname="org.jdom.Element" classpath="${jdom.jar}"/>
- <available property="ant.present" classname="org.apache.tools.ant.Task" classpath="${ant.jar}"/>
- <available property="naming.present" classname="org.apache.naming.NamingEntry" classpath="${naming.jar}"/>
- <available property="resources.present" classname="org.apache.naming.resources.Resource" classpath="${resources.jar}"/>
- <available property="jdbc20ext.present" classname="javax.sql.DataSource" classpath="${jdbc20ext.jar}"/>
<condition property="jvm14.present">
<equals arg1="${ant.java.version}" arg2="1.4"/>
</condition>
@@ -213,7 +137,6 @@
<echo message="Environment:"/>
<echo message=" Java home ${java.home}"/>
<echo message=" Java version ${ant.java.version}"/>
- <echo message=" Compiler type ${build.compiler}"/>
<echo message=""/>
<echo message="Build options:"/>
<echo message=" Generate debugging info ${compile.debug}"/>
@@ -223,58 +146,19 @@
<echo message=" Distribution directory ${slide.dist}"/>
<echo message=" Distribution archive name ${slide.archive}"/>
<echo message=""/>
- <echo message="Required libraries:"/>
- <echo message=" Servlet API 2.3 ${servlet23.present}"/>
- <echo message=" JAXP (1.0 or later) ${jaxp10.present}"/>
+ <echo message="Libraries:"/>
+ <echo message=" JAXP (1.1 or later) ${jaxp.present}"/>
<echo message=" XML DOM Level 2 API ${dom.present}"/>
<echo message=" XML SAX 2 API ${sax.present}"/>
- <echo message=" Java Transaction API ${jta.present}"/>
- <echo message=" JDOM (current dev version) ${jdom.present}"/>
- <echo message=" Commons-Httpclient ${httpclient.present}"/>
- <echo message=" ANTLR ${antlr.present}"/>
- <echo message=" ANTLR Tools ${antlr-tools.present}"/>
<echo message=""/>
- <echo message="Optional libraries:"/>
- <echo message=" JAXP 1.1 ${jaxp11.present}"/>
- <echo message=" JDBC 2.0 optional package ${jdbc20ext.present}"/>
- <echo message=" Commons-Modeler ${modeler.present}"/>
- <echo message=" Ant ${ant.present}"/>
- <echo message=" Ant <style>-task ${xsl.present}"/>
- <echo message=" JUnit ${junit.present}"/>
- <echo message=" Log4J ${log4j.present}"/>
- <echo message=" Tomcat (4.1 or later) ${catalina.present}"/>
- <echo message=" Tomcat naming.jar ${naming.present}"/>
- <echo message=" Tomcat resources.jar ${resources.present}"/>
+ <echo message="Optional Tomcat bundle:"/>
+ <echo message=" Tomcat (5.0 or later) ${catalina.dist}"/>
<echo message=""/>
- <echo message="Library locations:"/>
- <echo message=" Servlet API jar ${servlet.jar}"/>
- <echo message=" JAXP jar ${jaxp.jar}"/>
- <echo message=" XML DOM/SAX2 APIs jar ${xmlapi.jar}"/>
- <echo message=" XML Parser jar ${xmlparser.jar}"/>
- <echo message=" JTA jar ${jta.jar}"/>
- <echo message=" JDOM jar ${jdom.jar}"/>
- <echo message=" Commons-Httpclient jar ${commons-httpclient.jar}"/>
- <echo message=" ANTLR jar ${antlr.jar}"/>
- <echo message=" JDBC 2.0 optional package jar ${jdbc20ext.jar}"/>
- <echo message=" Commons-Modeler jar ${commons-modeler.jar}"/>
- <echo message=" Ant jar ${ant.jar}"/>
- <echo message=" JUnit jar ${junit.jar}"/>
- <echo message=" Log4J jar ${log4j.jar}"/>
- <echo message=" Tomcat 4 dist directory ${catalina.dist}"/>
- <echo message=" Tomcat 4 catalina.jar ${catalina.jar}"/>
- <echo message=" Tomcat 4 resources.jar ${resources.jar}"/>
- <echo message=" Tomcat 4 naming.jar ${naming.jar}"/>
<condition property="required.present">
<and>
- <equals arg1="${servlet23.present}" arg2="true"/>
- <equals arg1="${jaxp10.present}" arg2="true"/>
- <equals arg1="${jdom.present}" arg2="true"/>
+ <equals arg1="${jaxp.present}" arg2="true"/>
<equals arg1="${dom.present}" arg2="true"/>
<equals arg1="${sax.present}" arg2="true"/>
- <equals arg1="${jta.present}" arg2="true"/>
- <equals arg1="${httpclient.present}" arg2="true"/>
- <equals arg1="${antlr.present}" arg2="true"/>
- <equals arg1="${antlr-tools.present}" arg2="true"/>
</and>
</condition>
</target>
@@ -290,7 +174,6 @@
<target name="prepare" depends="detect">
<mkdir dir="${slide.build}"/>
<mkdir dir="${slide.build}/classes"/>
- <mkdir dir="${slide.build}/tests"/>
<mkdir dir="${slide.build}/lib"/>
<mkdir dir="${slide.build}/doc"/>
<mkdir dir="${slide.build}/doc/schema"/>
@@ -333,7 +216,6 @@
<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="**/j2ee/**" unless="jdbc20ext.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">
@@ -345,6 +227,25 @@
</javac>
</target>
<!-- =================================================================== -->
+ <!-- Build JDK1.4 logging related components -->
+ <!-- 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/**">
+ <classpath refid="wrappers.classpath"/>
+ </javac>
+ <copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
+ <replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
+ <copy todir="${slide.build}/classes">
+ <fileset dir="src/etc">
+ <include name="LICENSE"/>
+ <include name="README"/>
+ <include name="CHANGELOG"/>
+ </fileset>
+ </copy>
+ <jar jarfile="${slide.dist}/slide/lib/${slide-jdk14logger.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/jdk14/**"/>
+ </target>
+ <!-- =================================================================== -->
<!-- Build documentation -->
<!-- =================================================================== -->
<target name="doc" depends="prepare" if="xsl.present" description="Generate documentation/website">
@@ -374,6 +275,8 @@
<fileset dir="src/webdav/server">
<include name="**/webdav/**"/>
<exclude name="**/CVS/**"/>
+ <exclude name="**/Slide.java" unless="jmx.present"/>
+ <exclude name="**/SlideMBean.java" unless="jmx.present"/>
</fileset>
</copy>
<mkdir dir="${slide.build}/doc/serverjavadoc"/>
@@ -386,147 +289,6 @@
</copy>
</target>
<!-- =================================================================== -->
- <!-- Prepare WebDAV client -->
- <!-- =================================================================== -->
- <target name="webdav-client-prepare" depends="util">
- <mkdir dir="${webdavclient.build}"/>
- <mkdir dir="${webdavclient.build}/bin"/>
- <mkdir dir="${webdavclient.build}/classes"/>
- <mkdir dir="${webdavclient.build}/src/org/apache/webdav/cmd"/>
- <mkdir dir="${slide.build}/doc/clientjavadoc"/>
- <copy todir="${webdavclient.build}/classes">
- <fileset dir="${slide.build}/classes">
- <include name="**/org/apache/util/**"/>
- </fileset>
- </copy>
- <copy todir="${webdavclient.build}/src">
- <fileset dir="src/webdav/client/src">
- <include name="**/cmd/*.java"/>
- <include name="**/cmd/*.g"/>
- <exclude name="**/*Lexer*.java"/>
- <exclude name="**/*Parser*.java"/>
- </fileset>
- </copy>
- <replace file="${webdavclient.build}/src/org/apache/webdav/cmd/Slide.java" token="$$VERSION$$" value="${version}"/>
- </target>
- <!-- =================================================================== -->
- <!-- Build WebDAV client -->
- <!-- =================================================================== -->
- <target name="webdav-client" depends="webdav-client-prepare">
- <javac srcdir="src/webdav/client/src" destdir="${webdavclient.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="webdavclient.classpath"/>
- <exclude name="**/ant/**" unless="ant.present"/>
- <exclude name="**/cmd/*.g"/>
- </javac>
- <!-- antlr target="src/webdav/client/src/org/apache/webdav/cmd/Client.g"
- outputdirectory="${webdavclient.build}/src/org/apache/webdav/cmd">
- <classpath refid="webdavclient.classpath"/>
- </antlr -->
- <javac srcdir="${webdavclient.build}/src" destdir="${webdavclient.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="webdavclient.classpath"/>
- <exclude name="**/ant/**" unless="ant.present"/>
- </javac>
- <copy todir="${webdavclient.build}/bin">
- <fileset dir="src/webdav/client/bin">
- <include name="**/*.bat"/>
- <include name="**/*.sh"/>
- </fileset>
- </copy>
- <fixcrlf srcdir="${webdavclient.build}/bin" eol="crlf" includes="**/*.bat"/>
- <fixcrlf srcdir="${webdavclient.build}/bin" eol="lf" includes="**/*.sh"/>
- </target>
- <!-- =================================================================== -->
- <!-- Clean build and distribution directories of the DAV client -->
- <!-- =================================================================== -->
- <target name="webdav-client-clean">
- <delete dir="${webdavclient.build}"/>
- <delete dir="${webdavclient.dist}"/>
- </target>
- <!-- =================================================================== -->
- <!-- Prepare WebDAV client distribution -->
- <!-- =================================================================== -->
- <target name="webdav-client-dist-prepare">
- <mkdir dir="${webdavclient.dist}"/>
- <mkdir dir="${webdavclient.dist}/bin"/>
- <mkdir dir="${webdavclient.dist}/lib"/>
- <mkdir dir="${slide.dist}/doc/clientjavadoc"/>
- </target>
- <!-- =================================================================== -->
- <!-- Javadoc of the WebDAV client -->
- <!-- =================================================================== -->
- <target name="webdav-client-javadoc" unless="skip.javadoc">
- <property name="copyright" value=""/>
- <javadoc sourcepath="src/webdav/client/src" destdir="${slide.build}/doc/clientjavadoc" doctitle="Slide ${version} WebDAV Client JavaDoc" windowtitle="Slide WebDAV Client Javadoc" package="true" noindex="false" author="true" version="true" packagenames="org.apache.webdav.lib.*">
- <classpath refid="webdavclient.classpath"/>
- <link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
- </javadoc>
- <copy todir="${slide.dist}/doc/clientjavadoc">
- <fileset dir="${slide.build}/doc/clientjavadoc"/>
- </copy>
- </target>
- <!-- =================================================================== -->
- <!-- Build a DAV client distribution -->
- <!-- =================================================================== -->
- <target name="webdav-client-dist" depends="webdav-client, webdav-client-dist-prepare,webdav-client-javadoc,webdav-client-dist-xml" description="Build the WebDAV client library and command-line application">
- <copy todir="${webdavclient.dist}/bin">
- <fileset dir="${webdavclient.build}/bin">
- <include name="**/*.bat"/>
- <include name="**/*.sh"/>
- </fileset>
- </copy>
- <chmod dir="${webdavclient.dist}/bin" perm="+x" includes="**/*.sh"/>
- <copy file="src/etc/MANIFEST.MF" tofile="${webdavclient.build}/classes/MANIFEST.MF"/>
- <replace file="${webdavclient.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
- <echo message="Copying libraries"/>
- <copy todir="${webdavclient.dist}/lib" file="${antlr.jar}"/>
- <copy todir="${webdavclient.dist}/lib" file="${commons-httpclient.jar}"/>
- <copy todir="${webdavclient.dist}/lib" file="${commons-logging.jar}"/>
- <echo message="Building DAV Client library JAR file"/>
- <jar jarfile="${webdavclient.dist}/lib/slide-webdavlib.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/util/**,org/apache/webdav/lib/**,org/apache/webdav/util/**">
- <metainf dir=".">
- <include name="LICENSE"/>
- </metainf>
- </jar>
- <echo message="Building DAV Client JAR"/>
- <jar jarfile="${webdavclient.dist}/lib/slide-client.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/webdav/cmd/**">
- <metainf dir=".">
- <include name="LICENSE"/>
- </metainf>
- </jar>
- <echo message="Building DAV Anttasks JAR"/>
- <jar jarfile="${webdavclient.dist}/lib/slide-anttasks.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/webdav/ant/**">
- <metainf dir=".">
- <include name="LICENSE"/>
- </metainf>
- </jar>
- <echo message="Building DAV Swing JAR"/>
- <jar jarfile="${webdavclient.dist}/lib/slide-swing.jar" basedir="${webdavclient.build}/classes" manifest="${webdavclient.build}/classes/MANIFEST.MF" includes="org/apache/webdav/ui/**">
- <metainf dir=".">
- <include name="LICENSE"/>
- </metainf>
- </jar>
- </target>
- <target name="webdav-client-dist-xml" unless="jvm14.present">
- <copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}"/>
- <copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}"/>
- </target>
- <!-- =================================================================== -->
- <!-- Build some tests -->
- <!-- =================================================================== -->
- <target name="tests" depends="main, webdav-client-dist" if="junit.present">
- <javac srcdir="src/tests" destdir="${slide.build}/tests" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${slide.build}/tests">
- <fileset dir="src/tests">
- <exclude name="**/CVS/**"/>
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- <copy file="${webdavclient.dist}/lib/slide-webdavlib.jar" tofile="${slide.build}/tests/webdavlib.jar"/>
- <copy file="${junit.jar}" tofile="${slide.build}/tests/junit.jar"/>
- </target>
- <!-- =================================================================== -->
<!-- Clean build and distribution directories -->
<!-- =================================================================== -->
<target name="clean" description="Delete previous build">
@@ -551,18 +313,16 @@
<target name="prepare-dist">
<echo message="Creating distribution directories"/>
<mkdir dir="${slide.dist}"/>
- <mkdir dir="${slide.dist}/client"/>
<mkdir dir="${slide.dist}/server"/>
<mkdir dir="${slide.dist}/slide/webapp"/>
<mkdir dir="${slide.dist}/slide/lib"/>
- <mkdir dir="${slide.dist}/slide/tests"/>
<mkdir dir="${slide.dist}/doc"/>
<mkdir dir="${slide.dist}/slide/wrappers"/>
</target>
<!-- =================================================================== -->
<!-- Build a Slide distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="main,tests,prepare-dist,doc,javadoc,dist-xml" description="Make distribution of core components">
+ <target name="dist" depends="main,prepare-dist,doc,javadoc,dist-xml,jdk14-logging" description="Make distribution of core components">
<copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
<replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
<copy todir="${slide.build}/classes">
@@ -574,13 +334,13 @@
</fileset>
</copy>
<echo message="Building Slide main JAR file"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-kernel.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**" excludes="org/apache/slide/webdav/**"/>
+ <jar jarfile="${slide.dist}/slide/lib/${slide-kernel.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**" excludes="org/apache/slide/webdav/**"/>
<echo message="Building Slide Standard Stores JAR file"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-stores.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,slidestore/**,org/apache/slide/store/impl/**,org/apache/slide/store/util/**,org/apache/slide/store/txfile/**"/>
+ <jar jarfile="${slide.dist}/slide/lib/${slide-stores.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,slidestore/**,org/apache/slide/store/impl/**,org/apache/slide/store/util/**,org/apache/slide/store/txfile/**"/>
<echo message="Building Default Roles JAR file"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-roles.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,slideroles/**"/>
+ <jar jarfile="${slide.dist}/slide/lib/${slide-roles.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,slideroles/**"/>
<echo message="Building WebDAV Servlet JAR"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-webdavservlet.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**"/>
+ <jar jarfile="${slide.dist}/slide/lib/${slide-webdavservlet.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**"/>
<echo message="Copying documentation"/>
<copy todir="${slide.dist}/doc">
<fileset dir="${slide.build}/doc"/>
@@ -593,16 +353,10 @@
<include name="RELEASE-INFO"/>
</fileset>
</copy>
- <echo message="Copying tests"/>
- <copy todir="${slide.dist}/slide/tests">
- <fileset dir="${slide.build}/tests"/>
- </copy>
<echo message="Copying libraries"/>
<copy todir="${slide.dist}/slide/lib">
<fileset dir="${slide.build}/lib"/>
</copy>
- <copy todir="${slide.dist}/slide/lib" file="${jta.jar}"/>
- <copy todir="${slide.dist}/slide/lib" file="${jdom.jar}"/>
</target>
<target name="dist-xml" unless="jvm14.present">
<copy todir="${slide.dist}/slide/lib" file="${jaxp.jar}"/>
@@ -614,14 +368,18 @@
<!-- =================================================================== -->
<target name="webapp-dist" depends="dist">
<filter token="AUTH" value="${authenticate}"/>
+ <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes">
+ <fileset dir="src/conf/webapp">
+ <include name="web.xml"/>
+ <include name="slide.properties"/>
+ <include name="log4j.properties"/>
+ </fileset>
+ </copy>
<war warfile="${webapp.dist}/slide.war" webxml="${slide.dist}/slide/conf/web.xml">
<fileset dir="src/conf/webapp">
<include name="**/Domain.xml"/>
</fileset>
- <lib dir="${slide.dist}/slide/lib">
- <exclude name="antlr*.jar"/>
- <exclude name="slide-taglib*.jar"/>
- </lib>
+ <lib dir="${slide.dist}/slide/lib"/>
</war>
<war warfile="${webapp.dist}/slide-doc.war" webxml="src/conf/webapp/webdoc.xml">
<fileset dir="${slide.dist}/doc">
@@ -658,7 +416,7 @@
<include name="slide-descriptors.xml"/>
</fileset>
</copy>
- <jar jarfile="${slide.dist}/slide/wrappers/slide-catalinawrapper.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/wrappers/catalina/**"/>
+ <jar jarfile="${slide.dist}/slide/wrappers/${slide-catalinawrapper.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/wrappers/catalina/**"/>
</target>
<!-- =================================================================== -->
<!-- Build Log4j related components -->
@@ -674,7 +432,7 @@
<include name="CHANGELOG"/>
</fileset>
</copy>
- <jar jarfile="${slide.dist}/slide/wrappers/slide-log4jwrapper.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/log4j/**"/>
+ <jar jarfile="${slide.dist}/slide/wrappers/${slide-log4jwrapper.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/log4j/**"/>
</target>
<!-- =================================================================== -->
<!-- Build Catalina-based dedicated CMS -->
@@ -705,7 +463,7 @@
<exclude name="crimson.jar"/>
</fileset>
</copy>
- <copy file="${slide.dist}/slide/wrappers/slide-catalinawrapper.jar" tofile="${slide.dist}/server/server/lib/slide-catalinawrapper.jar"/>
+ <copy file="${slide.dist}/slide/wrappers/${slide-catalinawrapper.jar}" tofile="${slide.dist}/server/server/lib/${slide-catalinawrapper.jar}"/>
<mkdir dir="${slide.dist}/server/webapps"/>
<mkdir dir="${slide.dist}/server/logs"/>
<mkdir dir="${slide.dist}/server/work"/>
@@ -726,7 +484,7 @@
<target name="testsuite-dist-prepare">
<mkdir dir="${testsuite.dist}"/>
</target>
- <target name="testsuite-dist" depends="testsuite-dist-prepare, webdav-client-dist">
+ <target name="testsuite-dist" depends="testsuite-dist-prepare">
<ant dir="testsuite"/>
<copy todir="${testsuite.dist}">
<fileset dir="${basedir}/testsuite" excludes="**/dist/**,**/CVS/**,**/testCasesResults.xml,**/testErrorsReport.txt"/>
@@ -740,7 +498,7 @@
<!-- =================================================================== -->
<!-- Full distribution -->
<!-- =================================================================== -->
- <target name="full-dist" depends="dist, webdav-client-dist, webapp-dist,catalina-wrapper,
+ <target name="full-dist" depends="dist, webapp-dist,catalina-wrapper,
catalina-dist, log4j-wrapper, testsuite-dist" description="Make a full distribution (with all optional components)"/>
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP -->
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org