Author: ate
Date: Fri May 22 14:54:33 2009
New Revision: 777555
URL: http://svn.apache.org/viewvc?rev=777555&view=rev
Log:
JS2-912: Adjust installer to embed Tomcat 6 instead of Tomcat 5.5
See: https://issues.apache.org/jira/browse/JS2-912
- some finale cleanup and corrections like using Tomcat 6.0.18 conf files as
base for our overrides instead of the old/outdated Tomcat 5.x base files
- also setting now required org.apache.portals.logdir as system property during
installation
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.bat
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.sh
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/context.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/server.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
Fri May 22 14:54:33 2009
@@ -23,11 +23,11 @@
"http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd";>
-->
-<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies"
name="Jetspeed Enterprise Portal 2.2-SNAPSHOT Installer"
+<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies"
name="Jetspeed Enterprise Portal 2.2.0-SNAPSHOT Installer"
windowIcon="/resources/feather-small.png"
defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.5"
wide="700:250" antialiased="true">
- <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.2-SNAPSHOT">
+ <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.2.0-SNAPSHOT">
<comment displayText="" />
<comment displayText="This installer will guide you through setting up the
Jetspeed Portal." />
</page>
@@ -35,15 +35,15 @@
<page type="license" name="license" displayText="License conditions"
resource="/LICENSE-ant-install.txt"></page>
<page type="input" name="properties" displayText="Installation location">
- <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.2-SNAPSHOT"
- defaultValueWin="C:\Apache\Jetspeed-2.2-SNAPSHOT" displayText="Select an
installation directory" create="true"
+ <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.2.0-SNAPSHOT"
+ defaultValueWin="C:\Apache\Jetspeed-2.2.0-SNAPSHOT" displayText="Select
an installation directory" create="true"
checkExists="true" />
<comment displayText=""/>
<comment displayText="Warning: on Windows, the location must not contain
spaces." bold="true"/>
</page>
<page type="input" name="requiredComponents" displayText="Components
selection">
- <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT"
bold="true" />
+ <comment displayText="Jetspeed Enterprise Portal version 2.2.0-SNAPSHOT"
bold="true" />
<target displayText="Tomcat 6.0.18 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
Fri May 22 14:54:33 2009
@@ -23,11 +23,11 @@
"http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd";>
-->
-<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies"
name="Jetspeed Enterprise Portal 2.2-SNAPSHOT Installer"
+<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies"
name="Jetspeed Enterprise Portal 2.2.0-SNAPSHOT Installer"
windowIcon="/resources/feather-small.png"
defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.5"
wide="700:250" antialiased="true">
- <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.2-SNAPSHOT">
+ <page type="input" name="intro" displayText="Welcome to the Jetspeed
Enterprise Portal 2.2.0-SNAPSHOT">
<comment displayText="" />
<comment displayText="This installer will guide you through setting up the
Jetspeed Portal." />
</page>
@@ -35,15 +35,15 @@
<page type="license" name="license" displayText="License conditions"
resource="/LICENSE-ant-install.txt"></page>
<page type="input" name="properties" displayText="Installation location">
- <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.2-SNAPSHOT"
- defaultValueWin="C:\Apache\Jetspeed-2.2-SNAPSHOT" displayText="Select an
installation directory" create="true"
+ <directory property="installDir"
defaultValue="${java.user.home}/Jetspeed-2.2.0-SNAPSHOT"
+ defaultValueWin="C:\Apache\Jetspeed-2.2.0-SNAPSHOT" displayText="Select
an installation directory" create="true"
checkExists="true" />
<comment displayText=""/>
<comment displayText="Warning: on Windows, the location must not contain
spaces." bold="true"/>
</page>
<page type="input" name="requiredComponents" displayText="Components
selection">
- <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT"
bold="true" />
+ <comment displayText="Jetspeed Enterprise Portal version 2.2.0-SNAPSHOT"
bold="true" />
<target displayText="Tomcat 6.0.18 Webserver" target="install"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Portal" property="dummy"
defaultValue="true" force="true" />
<checkbox displayText="Jetspeed Layout Portlets" property="dummy"
defaultValue="true" force="true" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
Fri May 22 14:54:33 2009
@@ -35,7 +35,7 @@
<fileset dir="${installDir}" includes="**/*"/>
</delete>
- <echo>Installing Jetspeed-2.2-SNAPSHOT Enterprise Portal</echo>
+ <echo>Installing Jetspeed-2.2.0-SNAPSHOT Enterprise Portal</echo>
<unzip src="${antinstaller.jar}" dest="${installDir}">
<patternset>
<include name="tomcat-portal.zip" />
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/build.xml
Fri May 22 14:54:33 2009
@@ -40,6 +40,7 @@
<property name="_jdbc.driver.class" value="${jdbc.driver.class}" />
<property name="jetspeedWebInfDir"
value="${basedir}/../webapps/${portalName}/WEB-INF" />
+ <property name="org.apache.portals.logdir" value="${basedir}/../logs" />
<target name="setupDB">
@@ -204,6 +205,7 @@
<sysproperty key="org.apache.jetspeed.database.password"
value="${_db.password}"/>
<sysproperty key="org.apache.jetspeed.database.url"
value="${_jdbc.url}"/>
<sysproperty key="org.apache.jetspeed.database.driver"
value="${_jdbc.driver.class}"/>
+ <sysproperty key="org.apache.portals.logdir"
value="${org.apache.portals.logdir}"/>
<arg line="-I
"${basedir}/resources/j2-seed.xml"
-a "${basedir}/../webapps/${portalName}"
@@ -236,6 +238,7 @@
<sysproperty key="org.apache.jetspeed.database.password"
value="${_db.password}"/>
<sysproperty key="org.apache.jetspeed.database.url"
value="${_jdbc.url}"/>
<sysproperty key="org.apache.jetspeed.database.driver"
value="${_jdbc.driver.class}"/>
+ <sysproperty key="org.apache.portals.logdir"
value="${org.apache.portals.logdir}"/>
<arg
line="-I "/"
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
Fri May 22 14:54:33 2009
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-; Jetspeed Enterprise Portal 2.2-SNAPSHOT Database setup configuration
+; Jetspeed Enterprise Portal 2.2.0-SNAPSHOT Database setup configuration
; db.type supported values: db2, derby, mssql, mysql, oracle, postgres, sapdb
[email protected]@
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.bat?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.bat
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.bat
Fri May 22 14:54:33 2009
@@ -14,7 +14,6 @@
rem See the License for the specific language governing permissions and
rem limitations under the License.
-...@echo off
if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Start/Stop Script for the CATALINA Server
@@ -28,7 +27,7 @@
rem the same directory that CATALINA_HOME points to.
rem
rem CATALINA_OPTS (Optional) Java runtime options used when the "start",
-rem "stop", or "run" command is executed.
+rem or "run" command is executed.
rem
rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory
rem the JVM should use (java.io.tmpdir). Defaults to
@@ -37,7 +36,7 @@
rem JAVA_HOME Must point at your Java Development Kit installation.
rem Required to run the with the "debug" argument.
rem
-rem JRE_HOME Must point at your Java Development Kit installation.
+rem JRE_HOME Must point at your Java Runtime installation.
rem Defaults to JAVA_HOME if empty.
rem
rem JAVA_OPTS (Optional) Java runtime options used when the "start",
@@ -53,7 +52,19 @@
rem JPDA_ADDRESS (Optional) Java runtime options used when the "jpda
start"
rem command is executed. The default is "jdbconn".
rem
-rem $Id: catalina.bat 355227 2005-12-08 21:44:16Z keith $
+rem JPDA_SUSPEND (Optional) Java runtime options used when the "jpda
start"
+rem command is executed. Specifies whether JVM should suspend
+rem execution immediately after startup. Default is "n".
+rem
+rem JPDA_OPTS (Optional) Java runtime options used when the "jpda
start"
+rem command is executed. If used, JPDA_TRANSPORT,
JPDA_ADDRESS,
+rem and JPDA_SUSPEND are ignored. Thus, all required jpda
+rem options MUST be specified. The default is:
+rem
+rem -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,
+rem
address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+rem
+rem $Id: catalina.bat 656834 2008-05-15 21:04:04Z markt $
rem ---------------------------------------------------------------------------
set JAVA_OPTS=%JAVA_OPTS% -Xmx256m
@@ -74,7 +85,12 @@
:okHome
rem Get standard environment variables
+if "%CATALINA_BASE%" == "" goto gotSetenvHome
+if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat"
+goto gotSetenvBase
+:gotSetenvHome
if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
+:gotSetenvBase
rem Get standard Java environment variables
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
@@ -100,7 +116,7 @@
set CATALINA_TMPDIR=%CATALINA_BASE%\temp
:gotTmpdir
-if not exist "%CATALINA_HOME%\bin\tomcat-juli.jar" goto noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
set JAVA_OPTS=%JAVA_OPTS%
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
:noJuli
@@ -131,6 +147,12 @@
if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
set JPDA_ADDRESS=jdbconn
:gotJpdaAddress
+if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
+set JPDA_SUSPEND=n
+:gotJpdaSuspend
+if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
+set
JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+:gotJpdaOpts
shift
:noJpda
@@ -156,7 +178,7 @@
:doDebug
shift
set _EXECJAVA=%_RUNJDB%
-set DEBUG_OPTS=-sourcepath
"%CATALINA_HOME%\..\..\jakarta-tomcat-catalina\catalina\src\share"
+set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\java"
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
@@ -188,10 +210,11 @@
:doStop
shift
set ACTION=stop
+set CATALINA_OPTS=
goto execCmd
:doVersion
-%_EXECJAVA% -classpath "%CATALINA_HOME%\server\lib\catalina.jar"
org.apache.catalina.util.ServerInfo
+%_EXECJAVA% -classpath "%CATALINA_HOME%\lib\catalina.jar"
org.apache.catalina.util.ServerInfo
goto end
@@ -215,10 +238,10 @@
goto end
:doJpda
if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath
"%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%"
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%"
%MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS%
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%"
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%"
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
goto end
:doSecurityJpda
-%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath
"%CLASSPATH%" -Djava.security.manager
-Djava.security.policy=="%SECURITY_POLICY_FILE%"
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%"
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %JPDA_OPTS% %DEBUG_OPTS%
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%"
-Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%"
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%"
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
goto end
:end
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.sh?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.sh
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/bin/catalina.sh
Fri May 22 14:54:33 2009
@@ -27,7 +27,7 @@
# the same directory that CATALINA_HOME points to.
#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
+# or "run" command is executed.
#
# CATALINA_TMPDIR (Optional) Directory path location of temporary directory
# the JVM should use (java.io.tmpdir). Defaults to
@@ -48,6 +48,18 @@
# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start"
# command is executed. The default is 8000.
#
+# JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start"
+# command is executed. Specifies whether JVM should suspend
+# execution immediately after startup. Default is "n".
+#
+# JPDA_OPTS (Optional) Java runtime options used when the "jpda start"
+# command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS,
+# and JPDA_SUSPEND are ignored. Thus, all required jpda
+# options MUST be specified. The default is:
+#
+# -Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,
+# address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND
+#
# JSSE_HOME (Optional) May point at your Java Secure Sockets Extension
# (JSSE) installation, whose JAR files will be added to the
# system class path used to start Tomcat.
@@ -89,7 +101,9 @@
# Only set CATALINA_HOME if not already set
[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
+if [ -r "$CATALINA_BASE"/bin/setenv.sh ]; then
+ . "$CATALINA_BASE"/bin/setenv.sh
+elif [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
. "$CATALINA_HOME"/bin/setenv.sh
fi
@@ -138,7 +152,7 @@
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
fi
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
if [ -z "$CATALINA_BASE" ] ; then
CATALINA_BASE="$CATALINA_HOME"
@@ -168,8 +182,9 @@
fi
# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
- JAVA_OPTS="$JAVA_OPTS
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
"-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
+ JAVA_OPTS="$JAVA_OPTS
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
fi
# ----- Execute The Requested Command -----------------------------------------
@@ -193,8 +208,11 @@
if [ -z "$JPDA_ADDRESS" ]; then
JPDA_ADDRESS="8000"
fi
+ if [ -z "$JPDA_SUSPEND" ]; then
+ JPDA_SUSPEND="n"
+ fi
if [ -z "$JPDA_OPTS" ]; then
- JPDA_OPTS="-Xdebug
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
+
JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
fi
CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
shift
@@ -209,9 +227,9 @@
if [ "$1" = "-security" ] ; then
echo "Using Security Manager"
shift
- exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -sourcepath
"$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+ -sourcepath "$CATALINA_HOME"/../../java \
-Djava.security.manager \
-Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
-Dcatalina.base="$CATALINA_BASE" \
@@ -219,9 +237,9 @@
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -sourcepath
"$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+ -sourcepath "$CATALINA_HOME"/../../java \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -235,7 +253,7 @@
if [ "$1" = "-security" ] ; then
echo "Using Security Manager"
shift
- exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djava.security.manager \
-Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -244,7 +262,7 @@
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
@@ -259,7 +277,7 @@
if [ "$1" = "-security" ] ; then
echo "Using Security Manager"
shift
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djava.security.manager \
-Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
@@ -273,7 +291,7 @@
echo $! > $CATALINA_PID
fi
else
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
@@ -295,7 +313,7 @@
FORCE=1
fi
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+ "$_RUNJAVA" $JAVA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
@@ -314,7 +332,7 @@
elif [ "$1" = "version" ] ; then
"$_RUNJAVA" \
- -classpath "$CATALINA_HOME/server/lib/catalina.jar" \
+ -classpath "$CATALINA_HOME/lib/catalina.jar" \
org.apache.catalina.util.ServerInfo
else
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/context.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/context.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/context.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/context.xml
Fri May 22 14:54:33 2009
@@ -1,29 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='utf-8'?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- The contents of this file will be loaded for each web application -->
-<Context antiJARLocking="true">
+<Context>
<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
-
+
<!-- Uncomment this to disable session persistence across Tomcat restarts
-->
<Manager pathname="" />
-</Context>
+ <!-- Uncomment this to enable Comet connection tacking (provides events
+ on session expiration as well as webapp lifecycle) -->
+ <!--
+ <Valve className="org.apache.catalina.valves.CometConnectionManagerValve"
/>
+ -->
+
+</Context>
\ No newline at end of file
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/server.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/server.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/server.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/server.xml
Fri May 22 14:54:33 2009
@@ -1,165 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='utf-8'?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
-->
-
<Server port="8005" shutdown="SHUTDOWN">
- <!-- Comment these entries out to disable JMX MBeans support used for the
- administration web application -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
- <!-- Global JNDI resources -->
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
<GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
<!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
+ UserDatabaseRealm to authenticate users
+ -->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
-
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
-->
-
- <!-- Define the Tomcat Stand-Alone Service -->
<Service name="Catalina">
-
+
+ <!--The connectors can use a shared executor, you can define one or more
named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
<!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 5 documentation bundle for more detailed
- instructions):
- * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
- later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA
(Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
-->
-
- <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector port="8080" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to 0 -->
-
- <!-- Note : To use gzip compression you could set the following
properties :
-
- compression="on"
- compressionMinSize="2048"
- noCompressionUserAgents="gozilla, traviata"
- compressableMimeType="text/html,text/xml"
- -->
-
- <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443"
+ emptySessionPath="true" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
<!--
- <Connector port="8443" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" scheme="https" secure="true"
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
- <!-- See proxy documentation for more information about using this. -->
- <!--
- <Connector port="8082"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" acceptCount="100"
connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
- -->
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
-
- <!-- Define the top level container in our container hierarchy -->
<Engine name="Catalina" defaultHost="localhost">
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.4
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
+ <!-- The request dumper valve dumps useful debugging information about
+ the request and response data received and sent by Tomcat.
+ Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-->
- <!-- Because this Realm is here, an instance will be shared globally -->
-
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
@@ -167,217 +121,27 @@
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
- -->
-
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="org.gjt.mm.mysql.Driver"
- connectionURL="jdbc:mysql://localhost/authority"
- connectionName="test" connectionPassword="test"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="oracle.jdbc.driver.OracleDriver"
- connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
- connectionName="scott" connectionPassword="tiger"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="sun.jdbc.odbc.JdbcOdbcDriver"
- connectionURL="jdbc:odbc:CATALINA"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
- <Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- Defines a cluster for this node,
- By defining this element, means that every manager will be
changed.
- So when running a cluster, only make sure that you have webapps
in there
- that need to be clustered and remove the other ones.
- A cluster has the following parameters:
-
- className = the fully qualified name of the cluster class
-
- clusterName = a descriptive name for your cluster, can be anything
-
- mcastAddr = the multicast address, has to be the same for all the
nodes
-
- mcastPort = the multicast port, has to be the same for all the
nodes
-
- mcastBindAddress = bind the multicast socket to a specific address
-
- mcastTTL = the multicast TTL if you want to limit your broadcast
-
- mcastSoTimeout = the multicast readtimeout
-
- mcastFrequency = the number of milliseconds in between sending a
"I'm alive" heartbeat
-
- mcastDropTime = the number a milliseconds before a node is
considered "dead" if no heartbeat is received
-
- tcpThreadCount = the number of threads to handle incoming
replication requests, optimal would be the same amount of threads as nodes
-
- tcpListenAddress = the listen address (bind address) for TCP
cluster request on this host,
- in case of multiple ethernet cards.
- auto means that address becomes
- InetAddress.getLocalHost().getHostAddress()
-
- tcpListenPort = the tcp listen port
-
- tcpSelectorTimeout = the timeout (ms) for the Selector.select()
method in case the OS
- has a wakup bug in java.nio. Set to 0 for no
timeout
-
- printToScreen = true means that managers will also print to
std.out
-
- expireSessionsOnShutdown = true means that
-
- useDirtyFlag = true means that we only replicate a session after
setAttribute,removeAttribute has been called.
- false means to replicate the session after each
request.
- false means that replication would work for the
following piece of code: (only for SimpleTcpReplicationManager)
- <%
- HashMap map = (HashMap)session.getAttribute("map");
- map.put("key","value");
- %>
- replicationMode = can be either 'pooled', 'synchronous' or
'asynchronous'.
- * Pooled means that the replication happens
using several sockets in a synchronous way. Ie, the data gets replicated, then
the request return. This is the same as the 'synchronous' setting except it
uses a pool of sockets, hence it is multithreaded. This is the fastest and
safest configuration. To use this, also increase the nr of tcp threads that you
have dealing with replication.
- * Synchronous means that the thread that
executes the request, is also the
- thread the replicates the data to the other
nodes, and will not return until all
- nodes have received the information.
- * Asynchronous means that there is a specific
'sender' thread for each cluster node,
- so the request thread will queue the
replication request into a "smart" queue,
- and then return to the client.
- The "smart" queue is a queue where when a
session is added to the queue, and the same session
- already exists in the queue from a previous
request, that session will be replaced
- in the queue instead of replicating two
requests. This almost never happens, unless there is a
- large network delay.
- -->
- <!--
- When configuring for clustering, you also add in a valve to catch
all the requests
- coming in, at the end of the request, the session may or may not
be replicated.
- A session is replicated if and only if all the conditions are met:
- 1. useDirtyFlag is true or setAttribute or removeAttribute has
been called AND
- 2. a session exists (has been created)
- 3. the request is not trapped by the "filter" attribute
-
- The filter attribute is to filter out requests that could not
modify the session,
- hence we don't replicate the session after the end of this request.
- The filter is negative, ie, anything you put in the filter, you
mean to filter out,
- ie, no replication will be done on requests that match one of the
filters.
- The filter attribute is delimited by ;, so you can't escape out ;
even if you wanted to.
-
- filter=".*\.gif;.*\.js;" means that we will not replicate the
session after requests with the URI
- ending with .gif and .js are intercepted.
-
- The deployer element can be used to deploy apps cluster wide.
- Currently the deployment only deploys/undeploys to working members
in the cluster
- so no WARs are copied upons startup of a broken node.
- The deployer watches a directory (watchDir) for WAR files when
watchEnabled="true"
- When a new war file is added the war gets deployed to the local
instance,
- and then deployed to the other instances in the cluster.
- When a war file is deleted from the watchDir the war is undeployed
locally
- and cluster wide
- -->
-
- <!--
- <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-
managerClassName="org.apache.catalina.cluster.session.DeltaManager"
- expireSessionsOnShutdown="false"
- useDirtyFlag="true"
- notifyListenersOnReplication="true">
-
- <Membership
- className="org.apache.catalina.cluster.mcast.McastService"
- mcastAddr="228.0.0.4"
- mcastPort="45564"
- mcastFrequency="500"
- mcastDropTime="3000"/>
-
- <Receiver
- className="org.apache.catalina.cluster.tcp.ReplicationListener"
- tcpListenAddress="auto"
- tcpListenPort="4001"
- tcpSelectorTimeout="100"
- tcpThreadCount="6"/>
-
- <Sender
-
className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
- replicationMode="pooled"
- ackTimeout="15000"
- waitForAck="true"/>
-
- <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-
filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-
- <Deployer
className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
- tempDir="/tmp/war-temp/"
- deployDir="/tmp/war-deploy/"
- watchDir="/tmp/war-listen/"
- watchEnabled="false"/>
-
- <ClusterListener
className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
- </Cluster>
- -->
-
-
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a
relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html -->
<!--
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a
relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- This access log implementation is optimized for maximum
performance,
- but is hardcoded to support only the "common" and "combined"
patterns.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
directory="logs"
+ prefix="localhost_access_log." suffix=".txt" pattern="common"
resolveHosts="false"/>
-->
</Host>
-
</Engine>
-
</Service>
-
</Server>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
Fri May 22 14:54:33 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='utf-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -6,21 +6,23 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
+<tomcat-users>
<!--
- NOTE: By default, no user is included in the "manager" role required
- to operate the "/manager" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary.
+ <role rolename="tomcat"/>
+ <role rolename="role1"/>
+ <user username="tomcat" password="tomcat" roles="tomcat"/>
+ <user username="both" password="tomcat" roles="tomcat,role1"/>
+ <user username="role1" password="tomcat" roles="role1"/>
-->
-<tomcat-users>
<role rolename="tomcat"/>
<role rolename="manager"/>
<role rolename="admin"/>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Fri May 22 14:54:33 2009
@@ -74,8 +74,14 @@
<unzip src="resources/${tomcat.name}.zip"
dest="${project.build.directory}"
overwrite="false"/>
+ <delete
file="${org.apache.jetspeed.portal.home}/bin/catalina.bat"/>
+ <delete
file="${org.apache.jetspeed.portal.home}/bin/catalina.sh"/>
+ <delete
file="${org.apache.jetspeed.portal.home}/conf/context.xml"/>
+ <delete
file="${org.apache.jetspeed.portal.home}/conf/server.xml"/>
+ <delete
file="${org.apache.jetspeed.portal.home}/conf/tomcat-users.xml"/>
<delete
dir="${org.apache.jetspeed.portal.home}/webapps/examples"/>
<delete
dir="${org.apache.jetspeed.portal.home}/webapps/docs"/>
+ <delete
dir="${org.apache.jetspeed.portal.home}/webapps/ROOT"/>
</tasks>
</configuration>
<goals>
@@ -182,8 +188,9 @@
<file>${project.build.directory}/resources/tomcat/context.xml</file>
<destination>context</destination>
</deployment>
+ <!-- Tomcat server conf override -->
<deployment>
-
<file>${project.build.directory}/../etc/tomcat/conf/tomcat-users.xml</file>
+
<file>${project.build.directory}/../etc/tomcat/conf/server.xml</file>
<destination>server-conf</destination>
</deployment>
<!-- admin pa -->
@@ -371,8 +378,9 @@
<file>${project.build.directory}/resources/tomcat/context.xml</file>
<destination>context</destination>
</deployment>
+ <!-- Tomcat server conf override -->
<deployment>
-
<file>${project.build.directory}/../etc/tomcat/conf/tomcat-users.xml</file>
+
<file>${project.build.directory}/../etc/tomcat/conf/server.xml</file>
<destination>server-conf</destination>
</deployment>
<!-- admin pa -->
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml?rev=777555&r1=777554&r2=777555&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
Fri May 22 14:54:33 2009
@@ -30,5 +30,13 @@
<directory>target/${tomcat.name}</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>etc/tomcat</directory>
+ <excludes>
+ <!-- already copied *and* rewritten during deploy processing -->
+ <exclude>conf/server.xml</exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
