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/14 17:06:41 UTC
cvs commit: jakarta-slide/src/doc howto-tomcat.xml
ozeigermann 2004/01/14 08:06:41
Modified: . build.properties.sample build.xml
src/doc howto-tomcat.xml
Added: src/conf/catalina slide.properties tomcat-5-server.patch
tomcat-4-server.patch
Removed: src/share/org/apache/slide slide.properties
Log:
Added new distribution targets for non-destructive bundling of Slide with Tomcat 4 and 5
Revision Changes Path
1.20 +4 -1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties.sample 13 Jan 2004 14:44:01 -0000 1.19
+++ build.properties.sample 14 Jan 2004 16:06:41 -0000 1.20
@@ -43,4 +43,7 @@
# ----- Catalina distribution directory -----
#catalina.dist=
catalina.server.lib=${catalina.dist}/server/lib
+catalina.common.lib=${catalina.dist}/common/lib
catalina.jar=${catalina.server.lib}/catalina.jar
+jmx.jar=${catalina.common.lib}/jmx.jar
+
1.189 +115 -60 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- build.xml 13 Jan 2004 14:44:01 -0000 1.188
+++ build.xml 14 Jan 2004 16:06:41 -0000 1.189
@@ -36,6 +36,7 @@
<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"/>
@@ -43,6 +44,7 @@
<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 -->
@@ -104,6 +106,8 @@
<pathelement location="${slide.build}/classes"/>
<pathelement location="${lib.dir}/${log4j.jar}"/>
<pathelement location="${catalina.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ <pathelement location="${lib.dir}/${jta.jar}"/>
</path>
<path id="webdavservlet.classpath">
<pathelement location="${xmlapi.jar}"/>
@@ -227,6 +231,25 @@
</javac>
</target>
<!-- =================================================================== -->
+ <!-- Build Log4j related components -->
+ <!-- This target requires Log4j -->
+ <!-- =================================================================== -->
+ <target name="log4j-logger" depends="main">
+ <javac srcdir="src/wrappers" 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-log4jlogger.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/log4j/**"/>
+ </target>
+ <!-- =================================================================== -->
<!-- Build JDK1.4 logging related components -->
<!-- This target requires JDK1.4 -->
<!-- =================================================================== -->
@@ -313,7 +336,6 @@
<target name="prepare-dist">
<echo message="Creating distribution directories"/>
<mkdir dir="${slide.dist}"/>
- <mkdir dir="${slide.dist}/server"/>
<mkdir dir="${slide.dist}/slide/webapp"/>
<mkdir dir="${slide.dist}/slide/lib"/>
<mkdir dir="${slide.dist}/doc"/>
@@ -322,7 +344,7 @@
<!-- =================================================================== -->
<!-- Build a Slide distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="main,prepare-dist,doc,javadoc,dist-xml,jdk14-logging" description="Make distribution of core components">
+ <target name="dist" depends="main,prepare-dist,doc,javadoc,dist-xml,log4j-logger, 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">
@@ -334,6 +356,7 @@
</fileset>
</copy>
<echo message="Building Slide main JAR file"/>
+ <copy file="src/conf/webapp/slide.properties" tofile="${slide.build}/classes/org/apache/slide/slide.properties"/>
<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/**"/>
@@ -366,7 +389,7 @@
<!-- =================================================================== -->
<!-- Build a Slide distribution packaged as a web application -->
<!-- =================================================================== -->
- <target name="webapp-dist" depends="dist">
+ <target name="webapp-dist" depends="dist" description="Creates a web archive (war) without authentication">
<filter token="AUTH" value="${authenticate}"/>
<copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes">
<fileset dir="src/conf/webapp">
@@ -387,20 +410,15 @@
</war>
</target>
<!-- =================================================================== -->
- <!-- Build wrappers -->
+ <!-- Build Catalina related components -->
+ <!-- This target requires Tomcat 4 or 5 -->
<!-- =================================================================== -->
- <target name="wrappers" depends="main">
+ <target name="catalina-wrapper" depends="dist" if="catalina.present">
<javac srcdir="src/wrappers" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
<classpath refid="wrappers.classpath"/>
<exclude name="**/catalina/**" unless="catalina.present"/>
- <exclude name="**/log4j/**" unless="log4j.present"/>
+ <exclude name="**/log4j/**"/>
</javac>
- </target>
- <!-- =================================================================== -->
- <!-- Build Catalina related components -->
- <!-- This target requires Tomcat 4.0 -->
- <!-- =================================================================== -->
- <target name="catalina-wrapper" depends="wrappers" if="catalina.present">
<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">
@@ -419,63 +437,100 @@
<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 -->
- <!-- This target requires Log4j -->
+ <!-- Installs Slide with Tomcat 4.x using Tomcat authentication -->
+ <!-- This target requires Tomcat 4.x -->
<!-- =================================================================== -->
- <target name="log4j-wrapper" depends="wrappers" if="log4j.present">
- <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"/>
+ <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>
- <jar jarfile="${slide.dist}/slide/wrappers/${slide-log4jwrapper.jar}" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/log4j/**"/>
+
+ <!-- patch server.xml -->
+ <patch originalfile="${catalina.dist}/conf/server.xml" patchfile="${slide.dist}/slide/catalina-conf/tomcat-4-server.patch" />
</target>
<!-- =================================================================== -->
- <!-- Build Catalina-based dedicated CMS -->
- <!-- This target requires Tomcat 4.0 -->
+ <!-- Installs Slide with Tomcat 5.x using Tomcat authentication -->
+ <!-- This target requires Tomcat 5.x -->
<!-- =================================================================== -->
- <target name="catalina-dist" depends="catalina-wrapper" if="catalina.present">
- <copy todir="${slide.dist}/server">
- <fileset dir="${catalina.dist}">
- <exclude name="webapps/**"/>
- <exclude name="src/**"/>
- <exclude name="jtc-src/**"/>
- <exclude name="logs/**"/>
- <exclude name="work/**"/>
- <exclude name="server/lib/commons-dbcp.jar"/>
- <exclude name="server/lib/commons-pool.jar"/>
- <exclude name="*"/>
+ <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>
- <copy todir="${slide.dist}/server">
- <fileset dir="${catalina.dist}">
- <include name="webapps/*.xml"/>
+
+ <!-- patch server.xml -->
+ <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 -->
+ <copy todir="${slide.dist}/slide/catalina-conf" filtering="true" overwrite="yes">
+ <fileset dir="src/conf/webapp">
+ <include name="web.xml"/>
+ <include name="log4j.properties"/>
</fileset>
</copy>
- <copy todir="${slide.dist}/server/common/lib">
+ <filter token="CATALINA" value="${catalina.dist}"/>
+ <copy todir="${slide.dist}/slide/catalina-conf" filtering="true" overwrite="yes">
+ <fileset dir="src/conf/catalina">
+ <include name="slide.properties"/>
+ <include name="server.patch"/>
+ </fileset>
+ </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">
+ <include name="Domain.xml"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${catalina.dist}/slide/WEB-INF"/>
+ <copy todir="${catalina.dist}/slide/WEB-INF" overwrite="yes">
+ <fileset dir="${slide.dist}/slide/catalina-conf">
+ <include name="web.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- install jars in common lib and remove older Tomcat versions -->
+ <copy todir="${catalina.dist}/common/lib">
<fileset dir="${slide.dist}/slide/lib">
- <exclude name="commons-modeler.jar"/>
- <exclude name="jaxp.jar"/>
- <exclude name="crimson.jar"/>
- </fileset>
- </copy>
- <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"/>
- <mkdir dir="${slide.dist}/server/blank"/>
- <mkdir dir="${slide.dist}/server/slide"/>
- <mkdir dir="${slide.dist}/server/temp"/>
- <!-- Catalina documentation -->
- <war warfile="${slide.dist}/server/webapps/tomcat-doc.war" webxml="${catalina.dist}/webapps/tomcat-docs/WEB-INF/web.xml">
- <zipfileset dir="${catalina.dist}/webapps/tomcat-docs">
- </zipfileset>
- </war>
- <!-- Slide documentation -->
+ <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 -->
+ </fileset>
+ </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>
+
+ <!-- install wrapper in server lib -->
+ <copy todir="${catalina.dist}/server/lib">
+ <fileset dir="${slide.dist}/slide/wrappers"/>
+ </copy>
+
<copy file="${slide.dist}/slide/webapp/slide-doc.war" tofile="${slide.dist}/server/webapps/slide-doc.war"/>
</target>
<!-- =================================================================== -->
@@ -498,8 +553,8 @@
<!-- =================================================================== -->
<!-- Full distribution -->
<!-- =================================================================== -->
- <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)"/>
+ <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 -->
<!-- =================================================================== -->
1.1 jakarta-slide/src/conf/catalina/slide.properties
Index: slide.properties
===================================================================
# Domain XML definition file
# Default : Will look for domain.xml in current directory
org.apache.slide.domain=@CATALINA@/slide/Domain.xml
# Automatically perform security checks
# Default : true
org.apache.slide.security=true
# Automatically perform locking checks
# Default : true
org.apache.slide.lock=true
# Use version control (DeltaV)
# Default: true
org.apache.slide.versioncontrol=true
# DASL
# Default: true
org.apache.slide.search=true
# URL Encoding
# Default: platform default encoding
#org.apache.slide.urlEncoding=UTF-8
# Debug
# Default: false
org.apache.slide.debug=false
1.1 jakarta-slide/src/conf/catalina/tomcat-5-server.patch
Index: tomcat-5-server.patch
===================================================================
--- Tomcat 5.0/conf/server.xml 2004-01-14 15:16:31.000000000 +0100
+++ server.xml 2004-01-14 15:14:21.000000000 +0100
@@ -159,6 +159,8 @@
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
debug="0" resourceName="UserDatabase"/>
+ <Realm className="wrappers.catalina.SlideRealm" name="Slide DAV Server" namespace="slide" />
+
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
<!--
@@ -352,6 +354,12 @@
<Context path="" docBase="ROOT" debug="0">
-->
+ <Context path="/slide"
+ docBase="@CATALINA@/slide"
+ debug="9"
+ privileged="true"
+ useNaming="true"/>
+
</Host>
</Engine>
1.1 jakarta-slide/src/conf/catalina/tomcat-4-server.patch
Index: tomcat-4-server.patch
===================================================================
--- Tomcat 4.1.29/conf/server.xml 2004-01-14 14:48:35.000000000 +0100
+++ server.xml 2004-01-14 14:46:57.000000000 +0100
@@ -184,6 +184,8 @@
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
debug="0" resourceName="UserDatabase"/>
+ <Realm className="wrappers.catalina.SlideRealm" name="Slide DAV Server" namespace="slide" />
+
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
<!--
@@ -266,6 +268,12 @@
<Context path="" docBase="ROOT" debug="0"/>
-->
+ <Context path="/slide"
+ docBase="@CATALINA@/slide"
+ debug="9"
+ privileged="true"
+ useNaming="true"/>
+
<!-- Tomcat Examples Context -->
<Context path="/examples" docBase="examples" debug="0"
reloadable="true" crossContext="true">
1.18 +2 -1 jakarta-slide/src/doc/howto-tomcat.xml
Index: howto-tomcat.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/howto-tomcat.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- howto-tomcat.xml 12 Jan 2004 13:35:20 -0000 1.17
+++ howto-tomcat.xml 14 Jan 2004 16:06:41 -0000 1.18
@@ -60,7 +60,8 @@
Slide namespace. This works by modifying server.xml in conf and replacing
the standard realm configured in
<pre>
-<Realm className="org.apache.catalina.realm.MemoryRealm" />
+<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ debug="0" resourceName="UserDatabase"/>
</pre>
with the SlideRealm
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org