ozeigermann 2004/02/11 00:16:41
Modified: . Tag: SLIDE_2_0_RELEASE_BRANCH build.xml
src/conf/catalina Tag: SLIDE_2_0_RELEASE_BRANCH
slide.properties tomcat-5-server.patch
tomcat-4-server.patch
Log:
Fixed tomcat install targets.
Now they use relative instead of absolute paths to make them relocatable.
Revision Changes Path
No revision
No revision
1.191.2.5 +3 -7 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.191.2.4
retrieving revision 1.191.2.5
diff -u -r1.191.2.4 -r1.191.2.5
--- build.xml 9 Feb 2004 10:27:08 -0000 1.191.2.4
+++ build.xml 11 Feb 2004 08:16:41 -0000 1.191.2.5
@@ -437,8 +437,7 @@
<!-- 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">
+ <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-4-server.patch"/>
</fileset>
@@ -451,8 +450,7 @@
<!-- 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">
+ <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-5-server.patch"/>
</fileset>
@@ -475,11 +473,9 @@
<include name="log4j.properties"/>
</fileset>
</copy>
- <filter token="CATALINA" value="${catalina.dist}"/>
- <copy todir="${slide.dist}/slide/catalina-conf" filtering="true"
overwrite="yes">
+ <copy todir="${slide.dist}/slide/catalina-conf" 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"/>
No revision
No revision
1.1.2.1 +1 -1 jakarta-slide/src/conf/catalina/slide.properties
Index: slide.properties
===================================================================
RCS file: /home/cvs/jakarta-slide/src/conf/catalina/slide.properties,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- slide.properties 14 Jan 2004 16:06:41 -0000 1.1
+++ slide.properties 11 Feb 2004 08:16:41 -0000 1.1.2.1
@@ -1,6 +1,6 @@
# Domain XML definition file
# Default : Will look for domain.xml in current directory
[EMAIL PROTECTED]@/slide/Domain.xml
+org.apache.slide.domain=../slide/Domain.xml
# Automatically perform security checks
# Default : true
1.1.2.1 +1 -1 jakarta-slide/src/conf/catalina/tomcat-5-server.patch
Index: tomcat-5-server.patch
===================================================================
RCS file: /home/cvs/jakarta-slide/src/conf/catalina/tomcat-5-server.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- tomcat-5-server.patch 14 Jan 2004 16:06:41 -0000 1.1
+++ tomcat-5-server.patch 11 Feb 2004 08:16:41 -0000 1.1.2.1
@@ -14,7 +14,7 @@
-->
+ <Context path="/slide"
-+ docBase="@CATALINA@/slide"
++ docBase="../slide"
+ debug="9"
+ privileged="true"
+ useNaming="true"/>
1.1.2.1 +1 -1 jakarta-slide/src/conf/catalina/tomcat-4-server.patch
Index: tomcat-4-server.patch
===================================================================
RCS file: /home/cvs/jakarta-slide/src/conf/catalina/tomcat-4-server.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- tomcat-4-server.patch 14 Jan 2004 16:06:41 -0000 1.1
+++ tomcat-4-server.patch 11 Feb 2004 08:16:41 -0000 1.1.2.1
@@ -14,7 +14,7 @@
-->
+ <Context path="/slide"
-+ docBase="@CATALINA@/slide"
++ docBase="../slide"
+ debug="9"
+ privileged="true"
+ useNaming="true"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
