ozeigermann 2004/11/01 09:49:22
Modified: . build.xml
Added: src/conf/catalina catalina-jaas.sh.patch
Removed: src/conf/catalina startup-jaas.sh.patch
Log:
Fixed jaas authentication Tomcat bundle target for non-windows.
Scripts supplied by Tim Frank
Revision Changes Path
1.1 jakarta-slide/src/conf/catalina/catalina-jaas.sh.patch
Index: catalina-jaas.sh.patch
===================================================================
--- catalina.sh 2004-08-29 03:02:20.000000000 +0200
+++ tim-catalina.sh 2004-11-01 18:00:06.000000000 +0100
@@ -64,6 +64,7 @@
# Only set CATALINA_HOME if not already set
[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+export CATALINA_OPTS="${CATALINA_OPTS}
-Djava.security.auth.login.config=${CATALINA_HOME}/conf/jaas.config"
if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
. "$CATALINA_HOME"/bin/setenv.sh
1.242 +1 -1 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- build.xml 31 Oct 2004 11:34:42 -0000 1.241
+++ build.xml 1 Nov 2004 17:49:22 -0000 1.242
@@ -484,7 +484,7 @@
<patch originalfile="${catalina.dist}/conf/server.xml"
patchfile="src/conf/catalina/tomcat-jaas-server.patch"/>
<!-- patch startup -->
<patch originalfile="${catalina.dist}/bin/startup.bat"
patchfile="src/conf/catalina/startup-jaas.bat.patch"/>
- <patch originalfile="${catalina.dist}/bin/startup.sh"
patchfile="src/conf/catalina/startup-jaas.sh.patch"/>
+ <patch originalfile="${catalina.dist}/bin/catalina.sh"
patchfile="src/conf/catalina/catalina-jaas.sh.patch"/>
<!--ant antfile="build.xml" dir="projector" target="tomcat-install"/-->
</target>
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
