pnever 2004/01/14 09:10:32
Modified: . build.xml
Added: lib jdom.jar
Removed: lib jdom-dev-20030322.jar
Log:
Switched to JDOM-b9
Revision Changes Path
1.1 jakarta-slide/lib/jdom.jar
<<Binary file>>
1.190 +27 -33 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- build.xml 14 Jan 2004 16:06:41 -0000 1.189
+++ build.xml 14 Jan 2004 17:10:32 -0000 1.190
@@ -28,24 +28,21 @@
<!-- =================================================================== -->
<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="jdom.jar" value="jdom.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-kernel-bundle.jar"
value="slide-kernel-bundle-${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"/>
<property name="slide-log4jlogger.jar"
value="slide-log4jlogger-${version}.jar"/>
-
<!-- =================================================================== -->
<!-- Build Properties -->
<!-- =================================================================== -->
@@ -441,43 +438,38 @@
<!-- This target requires Tomcat 4.x -->
<!-- =================================================================== -->
<target name="tomcat-4-install" depends="tomcat-install" if="catalina.present"
description="Modifies Tomcat 4.x installation to include Slide">
-
<filter token="CATALINA" value="${catalina.dist}"/>
<copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-4-server.patch"/>
</fileset>
</copy>
-
<!-- patch server.xml -->
- <patch originalfile="${catalina.dist}/conf/server.xml"
patchfile="${slide.dist}/slide/catalina-conf/tomcat-4-server.patch" />
+ <patch originalfile="${catalina.dist}/conf/server.xml"
patchfile="${slide.dist}/slide/catalina-conf/tomcat-4-server.patch"/>
</target>
<!-- =================================================================== -->
<!-- Installs Slide with Tomcat 5.x using Tomcat authentication -->
<!-- This target requires Tomcat 5.x -->
<!-- =================================================================== -->
<target name="tomcat-5-install" depends="tomcat-install" if="catalina.present"
description="Modifies Tomcat 4.x installation to include Slide">
-
<filter token="CATALINA" value="${catalina.dist}"/>
<copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-5-server.patch"/>
</fileset>
</copy>
-
<!-- patch server.xml -->
- <patch originalfile="${catalina.dist}/conf/server.xml"
patchfile="${slide.dist}/slide/catalina-conf/tomcat-5-server.patch" />
+ <patch originalfile="${catalina.dist}/conf/server.xml"
patchfile="${slide.dist}/slide/catalina-conf/tomcat-5-server.patch"/>
</target>
<!-- =================================================================== -->
<!-- Installs Slide with Tomcat 5.x/4.xusing Tomcat authentication -->
<!-- This target requires Tomcat 5.x/4.x -->
<!-- =================================================================== -->
<target name="tomcat-install" depends="catalina-wrapper" if="catalina.present">
-
<!-- create Slide dir and copy Domain.xml and web.xml to it -->
-
<mkdir dir="${slide.dist}/slide/catalina-conf"/>
- <filter token="AUTH" value=""/> <!-- enable authentication -->
+ <filter token="AUTH" value=""/>
+ <!-- enable authentication -->
<copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
<fileset dir="src/conf/webapp">
<include name="web.xml"/>
@@ -493,7 +485,6 @@
</copy>
<copy file="${slide.dist}/slide/catalina-conf/slide.properties"
tofile="${slide.build}/classes/org/apache/slide/slide.properties"/>
<jar jarfile="${slide.dist}/slide/catalina-conf/${slide-kernel-bundle.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/**"/>
-
<mkdir dir="${catalina.dist}/slide"/>
<copy todir="${catalina.dist}/slide" overwrite="yes">
<fileset dir="src/conf/webapp">
@@ -506,31 +497,35 @@
<include name="web.xml"/>
</fileset>
</copy>
-
<!-- install jars in common lib and remove older Tomcat versions -->
- <copy todir="${catalina.dist}/common/lib">
+ <copy todir="${catalina.dist}/common/lib">
<fileset dir="${slide.dist}/slide/lib">
- <exclude name="${servlet.jar}"/> <!-- use local version -->
- <exclude name="${slide-kernel.jar}"/> <!-- use version with
different properties instead -->
+ <exclude name="${servlet.jar}"/>
+ <!-- use local version -->
+ <exclude name="${slide-kernel.jar}"/>
+ <!-- use version with different properties instead -->
</fileset>
<fileset dir="${slide.dist}/slide/catalina-conf">
- <include name="${slide-kernel-bundle.jar}"/> <!-- use version with
different properties -->
+ <include name="${slide-kernel-bundle.jar}"/>
+ <!-- use version with different properties -->
</fileset>
- </copy>
- <delete>
+ </copy>
+ <delete>
<fileset dir="${catalina.dist}/common/lib">
- <include name="commons-collections.jar"/> <!-- we might have a
newer version -->
- <include name="commons-dbcp-1.1.jar"/> <!-- we have a patched
version -->
- <include name="jta.jar"/> <!-- use geronimo version -->
- <include name="${slide-kernel.jar}"/> <!-- in case it has been
copied here before -->
- </fileset>
- </delete>
-
+ <include name="commons-collections.jar"/>
+ <!-- we might have a newer version -->
+ <include name="commons-dbcp-1.1.jar"/>
+ <!-- we have a patched version -->
+ <include name="jta.jar"/>
+ <!-- use geronimo version -->
+ <include name="${slide-kernel.jar}"/>
+ <!-- in case it has been copied here before -->
+ </fileset>
+ </delete>
<!-- install wrapper in server lib -->
- <copy todir="${catalina.dist}/server/lib">
+ <copy todir="${catalina.dist}/server/lib">
<fileset dir="${slide.dist}/slide/wrappers"/>
- </copy>
-
+ </copy>
<copy file="${slide.dist}/slide/webapp/slide-doc.war"
tofile="${slide.dist}/server/webapps/slide-doc.war"/>
</target>
<!-- =================================================================== -->
@@ -553,8 +548,7 @@
<!-- =================================================================== -->
<!-- Full distribution -->
<!-- =================================================================== -->
- <target name="full-dist" depends="dist, webapp-dist,catalina-wrapper,
testsuite-dist"
- description="Make a full distribution (with all optional components)"/>
+ <target name="full-dist" depends="dist, webapp-dist,catalina-wrapper,
testsuite-dist" description="Make a full distribution (with all optional components)"/>
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP -->
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
