Repository: juddi Updated Branches: refs/heads/master c606f786f -> fa39ad0db
JUDDI-935 fixed Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/fa39ad0d Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/fa39ad0d Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/fa39ad0d Branch: refs/heads/master Commit: fa39ad0db870bbdecdf0abf954ddc1a6d66264ee Parents: c606f78 Author: Alex <[email protected]> Authored: Tue Sep 29 20:14:55 2015 -0400 Committer: Alex <[email protected]> Committed: Tue Sep 29 20:14:55 2015 -0400 ---------------------------------------------------------------------- juddi-tomcat/assembly.xml | 2 +- juddi-tomcat/build.xml | 18 +- juddi-tomcat/catalina.bat | 112 +++++---- juddi-tomcat/catalina.sh | 378 +++++++++++++++++++++++-------- juddi-tomcat/pom.xml | 17 +- juddi-tomcat/server.xml | 89 ++++---- juddi-tomcat/serverNode2.xml | 89 ++++---- juddi-tomcat/serverNode3.xml | 89 ++++---- pom.xml | 5 +- uddi-tck/pom.xml | 15 +- uddi-tck/pref-rpt-1422229264251.txt | 12 - uddi-tck/server.xml | 83 ++++--- uddi-tck/serverNode2.xml | 88 ++++--- uddi-ws/pom.xml.orig | 85 ------- 14 files changed, 612 insertions(+), 470 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/assembly.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/assembly.xml b/juddi-tomcat/assembly.xml index d9000e3..8a0aa76 100644 --- a/juddi-tomcat/assembly.xml +++ b/juddi-tomcat/assembly.xml @@ -22,7 +22,7 @@ </formats> <fileSets> <fileSet> - <directory>${project.build.directory}/tomcat/apache-tomcat-6.0.26</directory> + <directory>${project.build.directory}/tomcat/apache-tomcat-7.0.64</directory> <outputDirectory></outputDirectory> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/build.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml index 03fc37b..6d0cc7b 100644 --- a/juddi-tomcat/build.xml +++ b/juddi-tomcat/build.xml @@ -33,11 +33,11 @@ <target name="copy-resources" depends="unzip-tomcat"> <!-- JUDDI-894 --> - <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.html" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> + <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> - +<!-- <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> - <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> + <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>--> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> @@ -49,7 +49,7 @@ <copy file="${basedir}/tomcat-users.xml" todir="${conf.dir}" overwrite="true"/> <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/> <copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3replication/META-INF" overwrite="true"/> - <copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/> + <!--<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>--> <copy file="${basedir}/keystore.jks" todir="${conf.dir}" overwrite="true"/> <copy file="${dependency.mysql.jar}" todir="${lib.dir}"/> @@ -85,11 +85,12 @@ <target name="copy-resources2" depends="unzip-tomcat2"> <!-- JUDDI-894 --> - <move file="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.html" tofile="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> + <move file="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> - +<!-- <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> + --> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> @@ -153,11 +154,12 @@ <target name="copy-resources3" depends="unzip-tomcat3"> <!-- JUDDI-894 --> - <move file="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.html" tofile="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> + <move file="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.jsp" tofile="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/> <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/> - +<!-- <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> + --> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/> <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/catalina.bat ---------------------------------------------------------------------- diff --git a/juddi-tomcat/catalina.bat b/juddi-tomcat/catalina.bat index 9286fe1..1278fb8 100644 --- a/juddi-tomcat/catalina.bat +++ b/juddi-tomcat/catalina.bat @@ -14,11 +14,13 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -if "%OS%" == "Windows_NT" setlocal rem --------------------------------------------------------------------------- rem Start/Stop Script for the CATALINA Server rem -rem Environment Variable Prequisites +rem Environment Variable Prerequisites +rem +rem Do not set the variables in this script. Instead put them into a script +rem setenv.bat in CATALINA_BASE/bin to keep your customizations separate. rem rem CATALINA_HOME May point at your Catalina "build" directory. rem @@ -27,7 +29,11 @@ rem of a Catalina installation. If not present, resolves to rem the same directory that CATALINA_HOME points to. rem rem CATALINA_OPTS (Optional) Java runtime options used when the "start", -rem or "run" command is executed. +rem "run" or "debug" command is executed. +rem Include here and not in JAVA_OPTS all options, that should +rem only be used by Tomcat itself, not by the stop process, +rem the version command etc. +rem Examples are heap size, GC logging, JMX ports etc. rem rem CATALINA_TMPDIR (Optional) Directory path location of temporary directory rem the JVM should use (java.io.tmpdir). Defaults to @@ -37,10 +43,21 @@ 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 Runtime installation. -rem Defaults to JAVA_HOME if empty. +rem Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +rem are both set, JRE_HOME is used. +rem +rem JAVA_OPTS (Optional) Java runtime options used when any command +rem is executed. +rem Include here and not in CATALINA_OPTS all options, that +rem should be used by Tomcat and also by the stop process, +rem the version command etc. +rem Most options should go into CATALINA_OPTS. rem -rem JAVA_OPTS (Optional) Java runtime options used when the "start", -rem "stop", or "run" command is executed. +rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories +rem containing some jars in order to allow replacement of APIs +rem created outside of the JCP (i.e. DOM and SAX from W3C). +rem It can also be used to update the XML parser implementation. +rem Defaults to $CATALINA_HOME/endorsed. rem rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" rem command is executed. The default is "dt_socket". @@ -64,27 +81,40 @@ rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file rem Example (all one line) rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties" rem -rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager +rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager rem Example (all one line) -rem set LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" +rem set LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" rem rem TITLE (Optional) Specify the title of Tomcat window. The default rem TITLE is Tomcat if it's not specified. rem Example (all one line) rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%] -rem -rem -rem -rem $Id: catalina.bat 915073 2010-02-22 21:22:13Z markt $ rem --------------------------------------------------------------------------- -rem Guess CATALINA_HOME if not defined +setlocal rem these are jUDDI specific settings set JAVA_OPTS=%JAVA_OPTS% -Xms256m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=256M set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password rem end custom settings + +rem Suppress Terminate batch job on CTRL+C +if not ""%1"" == ""run"" goto mainEntry +if "%TEMP%" == "" goto mainEntry +if exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.run" +if not exist "%TEMP%\%~nx0.run" goto mainEntry +echo Y>"%TEMP%\%~nx0.Y" +call "%~f0" %* <"%TEMP%\%~nx0.Y" +rem Use provided errorlevel +set RETVAL=%ERRORLEVEL% +del /Q "%TEMP%\%~nx0.Y" >NUL 2>&1 +exit /B %RETVAL% +:mainEntry +del /Q "%TEMP%\%~nx0.run" >NUL 2>&1 + +rem Guess CATALINA_HOME if not defined set "CURRENT_DIR=%cd%" if not "%CATALINA_HOME%" == "" goto gotHome set "CATALINA_HOME=%CURRENT_DIR%" @@ -93,23 +123,29 @@ cd .. set "CATALINA_HOME=%cd%" cd "%CURRENT_DIR%" :gotHome + if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome echo The CATALINA_HOME environment variable is not defined correctly echo This environment variable is needed to run this program goto end :okHome +rem Copy CATALINA_BASE from CATALINA_HOME if not defined +if not "%CATALINA_BASE%" == "" goto gotBase +set "CATALINA_BASE=%CATALINA_HOME%" +:gotBase + rem Ensure that any user defined CLASSPATH variables are not used on startup, rem but allow them to be specified in setenv.bat, in rare case when it is needed. set CLASSPATH= 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 not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome +call "%CATALINA_BASE%\bin\setenv.bat" +goto setenvDone +:checkSetenvHome if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat" -:gotSetenvBase +:setenvDone rem Get standard Java environment variables if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath @@ -117,31 +153,28 @@ echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat" echo This file is needed to run this program goto end :okSetclasspath -set "BASEDIR=%CATALINA_HOME%" call "%CATALINA_HOME%\bin\setclasspath.bat" %1 if errorlevel 1 goto end -if not "%CATALINA_BASE%" == "" goto gotBase -set "CATALINA_BASE=%CATALINA_HOME%" -:gotBase +rem Add on extra jar file to CLASSPATH +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto emptyClasspath +set "CLASSPATH=%CLASSPATH%;" +:emptyClasspath +set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar" if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir set "CATALINA_TMPDIR=%CATALINA_BASE%\temp" :gotTmpdir -rem Add tomcat-juli.jar and bootstrap.jar to classpath +rem Add tomcat-juli.jar to classpath rem tomcat-juli.jar can be over-ridden per instance -rem Note that there are no quotes as we do not want to introduce random -rem quotes into the CLASSPATH -if "%CLASSPATH%" == "" goto emptyClasspath -set "CLASSPATH=%CLASSPATH%;" -:emptyClasspath -if "%CATALINA_BASE%" == "%CATALINA_HOME%" goto juliClasspathHome if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome -set "CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar" +set "CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathDone :juliClasspathHome -set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar" +set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar" :juliClasspathDone if not "%LOGGING_CONFIG%" == "" goto noJuliConfig @@ -149,12 +182,12 @@ set LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig set LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties" :noJuliConfig -set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG% +set "JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%" if not "%LOGGING_MANAGER%" == "" goto noJuliManager set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager :noJuliManager -set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER% +set "JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%" rem ----- Execute The Requested Command --------------------------------------- @@ -197,6 +230,7 @@ if ""%1"" == ""debug"" goto doDebug if ""%1"" == ""run"" goto doRun if ""%1"" == ""start"" goto doStart if ""%1"" == ""stop"" goto doStop +if ""%1"" == ""configtest"" goto doConfigTest if ""%1"" == ""version"" goto doVersion echo Usage: catalina ( commands ... ) @@ -209,6 +243,7 @@ echo run -security Start in the current window with security manager echo start Start Catalina in a separate window echo start -security Start in a separate window with security manager echo stop Stop Catalina +echo configtest Run a basic syntax check on server.xml echo version What version of tomcat are you running? goto end @@ -232,13 +267,8 @@ goto execCmd :doStart shift -if not "%OS%" == "Windows_NT" goto noTitle if "%TITLE%" == "" set TITLE=Tomcat set _EXECJAVA=start "%TITLE%" %_RUNJAVA% -goto gotTitle -:noTitle -set _EXECJAVA=start %_RUNJAVA% -:gotTitle if not ""%1"" == ""-security"" goto execCmd shift echo Using Security Manager @@ -251,6 +281,12 @@ set ACTION=stop set CATALINA_OPTS= goto execCmd +:doConfigTest +shift +set ACTION=configtest +set CATALINA_OPTS= +goto execCmd + :doVersion %_EXECJAVA% -classpath "%CATALINA_HOME%\lib\catalina.jar" org.apache.catalina.util.ServerInfo goto end http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/catalina.sh ---------------------------------------------------------------------- diff --git a/juddi-tomcat/catalina.sh b/juddi-tomcat/catalina.sh index b4e040e..be608b9 100755 --- a/juddi-tomcat/catalina.sh +++ b/juddi-tomcat/catalina.sh @@ -16,9 +16,12 @@ # limitations under the License. # ----------------------------------------------------------------------------- -# Start/Stop Script for the CATALINA Server +# Control Script for the CATALINA Server # -# Environment Variable Prequisites +# Environment Variable Prerequisites +# +# Do not set the variables in this script. Instead put them into a script +# setenv.sh in CATALINA_BASE/bin to keep your customizations separate. # # CATALINA_HOME May point at your Catalina "build" directory. # @@ -26,21 +29,40 @@ # of a Catalina installation. If not present, resolves to # the same directory that CATALINA_HOME points to. # +# CATALINA_OUT (Optional) Full path to a file where stdout and stderr +# will be redirected. +# Default is $CATALINA_BASE/logs/catalina.out +# # CATALINA_OPTS (Optional) Java runtime options used when the "start", -# or "run" command is executed. +# "run" or "debug" command is executed. +# Include here and not in JAVA_OPTS all options, that should +# only be used by Tomcat itself, not by the stop process, +# the version command etc. +# Examples are heap size, GC logging, JMX ports etc. # # CATALINA_TMPDIR (Optional) Directory path location of temporary directory # the JVM should use (java.io.tmpdir). Defaults to # $CATALINA_BASE/temp. # # JAVA_HOME Must point at your Java Development Kit installation. -# Required to run the with the "debug" or "javac" argument. +# Required to run the with the "debug" argument. +# +# JRE_HOME Must point at your Java Runtime installation. +# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME +# are both set, JRE_HOME is used. # -# JRE_HOME Must point at your Java Development Kit installation. -# Defaults to JAVA_HOME if empty. +# JAVA_OPTS (Optional) Java runtime options used when any command +# is executed. +# Include here and not in CATALINA_OPTS all options, that +# should be used by Tomcat and also by the stop process, +# the version command etc. +# Most options should go into CATALINA_OPTS. # -# JAVA_OPTS (Optional) Java runtime options used when the "start", -# "stop", or "run" command is executed. +# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories +# containing some jars in order to allow replacement of APIs +# created outside of the JCP (i.e. DOM and SAX from W3C). +# It can also be used to update the XML parser implementation. +# Defaults to $CATALINA_HOME/endorsed. # # JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" # command is executed. The default is "dt_socket". @@ -60,34 +82,37 @@ # -agentlib:jdwp=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. -# # CATALINA_PID (Optional) Path of the file which should contains the pid -# of catalina startup java process, when start (fork) is used +# of the catalina startup java process, when start (fork) is +# used # # LOGGING_CONFIG (Optional) Override Tomcat's logging config file # Example (all one line) # LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" # -# LOGGING_MANAGER (Optional) Override Tomcat's logging manager +# LOGGING_MANAGER (Optional) Override Tomcat's logging manager # Example (all one line) -# LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -# -# $Id: catalina.sh 750920 2009-03-06 14:43:19Z markt $ +# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" # ----------------------------------------------------------------------------- # OS specific support. $var _must_ be set to either true or false. cygwin=false -os400=false darwin=false +os400=false case "`uname`" in CYGWIN*) cygwin=true;; -OS400*) os400=true;; Darwin*) darwin=true;; +OS400*) os400=true;; esac + + +# begin custom juddi settings +JAVA_OPTS="$JAVA_OPTS -Xms256m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=256M" +JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password" +# end custom juddi settings + + # resolve links - $0 may be a softlink PRG="$0" @@ -105,12 +130,19 @@ done PRGDIR=`dirname "$PRG"` # Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` -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 +# Copy CATALINA_BASE from CATALINA_HOME if not already set +[ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" + +# Ensure that any user defined CLASSPATH variables are not used on startup, +# but allow them to be specified in setenv.sh, in rare case when it is needed. +CLASSPATH= + +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 # For Cygwin, ensure paths are in UNIX format before anything is touched @@ -120,7 +152,6 @@ if $cygwin; then [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` - [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --unix "$JSSE_HOME"` fi # For OS400 @@ -141,11 +172,9 @@ if $os400; then # 1. owned by the user # 2. owned by the PRIMARY group of the user # this will not work if the user belongs in secondary groups - BASEDIR="$CATALINA_HOME" - . "$CATALINA_HOME"/bin/setclasspath.sh + . "$CATALINA_HOME"/bin/setclasspath.sh else if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then - BASEDIR="$CATALINA_HOME" . "$CATALINA_HOME"/bin/setclasspath.sh else echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" @@ -155,13 +184,13 @@ else fi # Add on extra jar files to CLASSPATH -if [ -n "$JSSE_HOME" ]; then - CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": fi -CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar +CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar -if [ -z "$CATALINA_BASE" ] ; then - CATALINA_BASE="$CATALINA_HOME" +if [ -z "$CATALINA_OUT" ] ; then + CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out fi if [ -z "$CATALINA_TMPDIR" ] ; then @@ -169,6 +198,14 @@ if [ -z "$CATALINA_TMPDIR" ] ; then CATALINA_TMPDIR="$CATALINA_BASE"/temp fi +# Add tomcat-juli.jar to classpath +# tomcat-juli.jar can be over-ridden per instance +if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then + CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar +else + CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar +fi + # Bugzilla 37848: When no TTY is available, don't output to console have_tty=0 if [ "`tty`" != "not a tty" ]; then @@ -183,7 +220,6 @@ if $cygwin; then CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --windows "$JSSE_HOME"` JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` fi @@ -197,17 +233,14 @@ if [ -z "$LOGGING_CONFIG" ]; then fi fi -# begin custom juddi settings -JAVA_OPTS="$JAVA_OPTS -Xms256m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=256M" -JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password" -# end custom juddi settings - if [ -z "$LOGGING_MANAGER" ]; then - JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -else - JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER" + LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" fi +# Uncomment the following line to make the umask available when using the +# org.apache.catalina.security.SecurityListener +#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" + # ----- Execute The Requested Command ----------------------------------------- # Bugzilla 37848: only output this if we have a TTY @@ -215,10 +248,14 @@ if [ $have_tty -eq 1 ]; then echo "Using CATALINA_BASE: $CATALINA_BASE" echo "Using CATALINA_HOME: $CATALINA_HOME" echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" - if [ "$1" = "debug" -o "$1" = "javac" ] ; then + if [ "$1" = "debug" ] ; then echo "Using JAVA_HOME: $JAVA_HOME" else - echo "Using JRE_HOME: $JRE_HOME" + echo "Using JRE_HOME: $JRE_HOME" + fi + echo "Using CLASSPATH: $CLASSPATH" + if [ ! -z "$CATALINA_PID" ]; then + echo "Using CATALINA_PID: $CATALINA_PID" fi fi @@ -246,9 +283,11 @@ if [ "$1" = "debug" ] ; then else shift if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift - exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -258,7 +297,7 @@ if [ "$1" = "debug" ] ; then -Djava.io.tmpdir="$CATALINA_TMPDIR" \ org.apache.catalina.startup.Bootstrap "$@" start else - exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ + exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Dcatalina.base="$CATALINA_BASE" \ @@ -272,84 +311,237 @@ elif [ "$1" = "run" ]; then shift if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift - exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start else - exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start fi elif [ "$1" = "start" ] ; then + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + if [ -s "$CATALINA_PID" ]; then + echo "Existing PID file found during start." + if [ -r "$CATALINA_PID" ]; then + PID=`cat "$CATALINA_PID"` + ps -p $PID >/dev/null 2>&1 + if [ $? -eq 0 ] ; then + echo "Tomcat appears to still be running with PID $PID. Start aborted." + echo "If the following process is not a Tomcat process, remove the PID file and try again:" + ps -f -p $PID + exit 1 + else + echo "Removing/clearing stale PID file." + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + else + echo "Unable to remove or clear stale PID file. Start aborted." + exit 1 + fi + fi + fi + else + echo "Unable to read PID file. Start aborted." + exit 1 + fi + else + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ ! -w "$CATALINA_PID" ]; then + echo "Unable to remove or write to empty PID file. Start aborted." + exit 1 + fi + fi + fi + fi + fi + shift - touch "$CATALINA_BASE"/logs/catalina.out + touch "$CATALINA_OUT" if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" + fi shift - "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ - >> "$CATALINA_BASE"/logs/catalina.out 2>&1 & + >> "$CATALINA_OUT" 2>&1 "&" - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID - fi else - "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ - >> "$CATALINA_BASE"/logs/catalina.out 2>&1 & + >> "$CATALINA_OUT" 2>&1 "&" - if [ ! -z "$CATALINA_PID" ]; then - echo $! > $CATALINA_PID - fi fi + if [ ! -z "$CATALINA_PID" ]; then + echo $! > "$CATALINA_PID" + fi + + echo "Tomcat started." + elif [ "$1" = "stop" ] ; then shift + + SLEEP=5 + if [ ! -z "$1" ]; then + echo $1 | grep "[^0-9]" >/dev/null 2>&1 + if [ $? -gt 0 ]; then + SLEEP=$1 + shift + fi + fi + FORCE=0 if [ "$1" = "-force" ]; then shift FORCE=1 fi - "$_RUNJAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + if [ -s "$CATALINA_PID" ]; then + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + echo "PID file found but no matching process was found. Stop aborted." + exit 1 + fi + else + echo "PID file is empty and has been ignored." + fi + else + echo "\$CATALINA_PID was set but the specified file does not exist. Is Tomcat running? Stop aborted." + exit 1 + fi + fi + + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" stop - if [ $FORCE -eq 1 ]; then + # stop failed. Shutdown port disabled? Try a normal kill. + if [ $? != 0 ]; then if [ ! -z "$CATALINA_PID" ]; then - echo "Killing: `cat $CATALINA_PID`" - kill -9 `cat $CATALINA_PID` + echo "The stop command failed. Attempting to signal the process to stop through OS signal." + kill -15 `cat "$CATALINA_PID"` >/dev/null 2>&1 + fi + fi + + if [ ! -z "$CATALINA_PID" ]; then + if [ -f "$CATALINA_PID" ]; then + while [ $SLEEP -ge 0 ]; do + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + # If Tomcat has stopped don't try and force a stop with an empty PID file + FORCE=0 + else + echo "The PID file could not be removed or cleared." + fi + fi + echo "Tomcat stopped." + break + fi + if [ $SLEEP -gt 0 ]; then + sleep 1 + fi + if [ $SLEEP -eq 0 ]; then + if [ $FORCE -eq 0 ]; then + echo "Tomcat did not stop in time. PID file was not removed. To aid diagnostics a thread dump has been written to standard out." + kill -3 `cat "$CATALINA_PID"` + fi + fi + SLEEP=`expr $SLEEP - 1 ` + done + fi + fi + + KILL_SLEEP_INTERVAL=5 + if [ $FORCE -eq 1 ]; then + if [ -z "$CATALINA_PID" ]; then + echo "Kill failed: \$CATALINA_PID not set" else - echo "Kill failed: \$CATALINA_PID not set" + if [ -f "$CATALINA_PID" ]; then + PID=`cat "$CATALINA_PID"` + echo "Killing Tomcat with the PID: $PID" + kill -9 $PID + while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do + kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + rm -f "$CATALINA_PID" >/dev/null 2>&1 + if [ $? != 0 ]; then + if [ -w "$CATALINA_PID" ]; then + cat /dev/null > "$CATALINA_PID" + else + echo "The PID file could not be removed." + fi + fi + # Set this to zero else a warning will be issued about the process still running + KILL_SLEEP_INTERVAL=0 + echo "The Tomcat process has been killed." + break + fi + if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then + sleep 1 + fi + KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 ` + done + if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then + echo "Tomcat has not been killed completely yet. The process might be waiting on some system call or might be UNINTERRUPTIBLE." + fi + fi fi fi +elif [ "$1" = "configtest" ] ; then + + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ + org.apache.catalina.startup.Bootstrap configtest + result=$? + if [ $result -ne 0 ]; then + echo "Configuration error detected!" + fi + exit $result + elif [ "$1" = "version" ] ; then "$_RUNJAVA" \ @@ -372,9 +564,13 @@ else echo " run -security Start in the current window with security manager" echo " start Start Catalina in a separate window" echo " start -security Start in a separate window with security manager" - echo " stop Stop Catalina" - echo " stop -force Stop Catalina (followed by kill -KILL)" + echo " stop Stop Catalina, waiting up to 5 seconds for the process to end" + echo " stop n Stop Catalina, waiting up to n seconds for the process to end" + echo " stop -force Stop Catalina, wait up to 5 seconds and then use kill -KILL if still running" + echo " stop n -force Stop Catalina, wait up to n seconds and then use kill -KILL if still running" + echo " configtest Run a basic syntax check on server.xml - check exit code for result" echo " version What version of tomcat are you running?" + echo "Note: Waiting for the process to end and use of the -force option require that \$CATALINA_PID is defined" exit 1 fi http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml index ba419ed..4cb3c4c 100644 --- a/juddi-tomcat/pom.xml +++ b/juddi-tomcat/pom.xml @@ -31,12 +31,22 @@ <artifactId>commons-discovery</artifactId> <version>0.2</version> </dependency> - <dependency> +<!-- <dependency> <artifactId>apache-tomcat</artifactId> <groupId>org.apache.juddi.bootstrap</groupId> - <version>6.0.26</version> + <version>6.0.44</version> <type>zip</type> </dependency> +--> +<dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat</artifactId> + <version>7.0.64</version> +<type>zip</type> + +</dependency> + + <dependency> <artifactId>juddiv3-war</artifactId> <groupId>org.apache.juddi</groupId> @@ -138,11 +148,12 @@ <property name="dependency.postgres.jar" value="${maven.dependency.postgresql.postgresql.jar.path}" /> <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}" /> <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" /> - <property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" /> + <property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.tomcat.tomcat.zip.path}" /> <property name="dependency.juddiv3.war" value="${project.build.directory}/juddiv3-war.war" /> <property name="dependency.juddiv3replication.war" value="${project.build.directory}/juddiv3-war-repl.war" /> <property name="dependency.juddi-gui.war" value="${project.build.directory}/juddi-gui-war.war" /> <property name="dependency.jaxws.jar" value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}" /> + <property name="apache.tomcat.version" value="7.0.64"/> <ant antfile="${basedir}/build.xml"> <property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" /> <target name="threenode" /> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/server.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/server.xml b/juddi-tomcat/server.xml index 6243f46..e98abb6 100644 --- a/juddi-tomcat/server.xml +++ b/juddi-tomcat/server.xml @@ -20,14 +20,18 @@ Documentation at /docs/config/server.html --> <Server port="8005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--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" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,19 +48,19 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + 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 --> <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-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) @@ -64,28 +68,28 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="8080" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="8443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + 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 --> - + This connector uses the BIO implementation that requires the JSSE + style configuration. When using the APR/native implementation, the + OpenSSL style configuration is required as described in the APR/native + documentation --> <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="want" sslProtocol="TLS" truststoreFile="truststore.jks" truststorePass="password" - keystoreFile="conf/keystore.jks" keystorePass="password" - /> - + keystoreFile="conf/keystore.jks" keystorePass="password" + /> + <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> @@ -97,8 +101,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -106,39 +110,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- 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"/> --> - <!-- 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 - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- 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 + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- 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"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- 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"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/serverNode2.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/serverNode2.xml b/juddi-tomcat/serverNode2.xml index 7f34dda..1efc143 100644 --- a/juddi-tomcat/serverNode2.xml +++ b/juddi-tomcat/serverNode2.xml @@ -20,14 +20,18 @@ Documentation at /docs/config/server.html --> <Server port="9005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--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" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,19 +48,19 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + 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 --> <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-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) @@ -64,28 +68,28 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="9080" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="9080" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="9443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + 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 --> - + This connector uses the BIO implementation that requires the JSSE + style configuration. When using the APR/native implementation, the + OpenSSL style configuration is required as described in the APR/native + documentation --> <Connector port="9443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="want" sslProtocol="TLS" truststoreFile="truststore.jks" truststorePass="password" - keystoreFile="conf/keystore.jks" keystorePass="password" - /> - + keystoreFile="conf/keystore.jks" keystorePass="password" + /> + <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="9009" protocol="AJP/1.3" redirectPort="9443" /> @@ -97,8 +101,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -106,39 +110,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- 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"/> --> - <!-- 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 - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- 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 + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- 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"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- 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"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/juddi-tomcat/serverNode3.xml ---------------------------------------------------------------------- diff --git a/juddi-tomcat/serverNode3.xml b/juddi-tomcat/serverNode3.xml index 0ef70cc..d1e671e 100644 --- a/juddi-tomcat/serverNode3.xml +++ b/juddi-tomcat/serverNode3.xml @@ -20,14 +20,18 @@ Documentation at /docs/config/server.html --> <Server port="10005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--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" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,19 +48,19 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + 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 --> <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-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) @@ -64,28 +68,28 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="10080" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="10080" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="10443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + 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 --> - + This connector uses the BIO implementation that requires the JSSE + style configuration. When using the APR/native implementation, the + OpenSSL style configuration is required as described in the APR/native + documentation --> <Connector port="10443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="want" sslProtocol="TLS" truststoreFile="truststore.jks" truststorePass="password" - keystoreFile="conf/keystore.jks" keystorePass="password" - /> - + keystoreFile="conf/keystore.jks" keystorePass="password" + /> + <!-- Define an AJP 1.3 Connector on port 8009 --> <Connector port="10009" protocol="AJP/1.3" redirectPort="10443" /> @@ -97,8 +101,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -106,39 +110,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- 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"/> --> - <!-- 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 - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- 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 + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- 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"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- 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"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a385d8b..c12179e 100644 --- a/pom.xml +++ b/pom.xml @@ -372,11 +372,12 @@ under the License. <id>maven2-repository.dev.java.net</id> <url>http://download.java.net/maven/2</url> </pluginRepository> - <pluginRepository> + <!-- this repo is dead jim + <pluginRepository> <id>nexus.codehaus</id> <url>https://nexus.codehaus.org/content/repositories/releases/</url> </pluginRepository> - +--> </pluginRepositories> <profiles> <!-- inherit from the apache parent: release-profile --> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index 793515f..6cf5348 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -23,8 +23,11 @@ <version>3.3.1-SNAPSHOT</version> </parent> <artifactId>uddi-tck</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> <name>UDDI TCK Tests</name> + <properties> + <cargo.version>1.4.16</cargo.version> + </properties> <dependencies> <dependency> <groupId>org.apache.juddi</groupId> @@ -205,7 +208,7 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0</version> + <version>${cargo.version}</version> <executions> <execution> @@ -214,7 +217,7 @@ <configuration> <wait>false</wait> <container> - <containerId>tomcat6x</containerId> + <containerId>tomcat7x</containerId> <home>${basedir}/target/juddi-tomcat-${project.parent.version}</home> </container> <configuration> @@ -240,7 +243,7 @@ <configuration> <wait>false</wait> <container> - <containerId>tomcat6x</containerId> + <containerId>tomcat7x</containerId> <home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home> </container> <configuration> @@ -264,7 +267,7 @@ <phase>post-integration-test</phase> <configuration> <container> - <containerId>tomcat6x</containerId> + <containerId>tomcat7x</containerId> </container> <configuration> <properties> @@ -283,7 +286,7 @@ <phase>post-integration-test</phase> <configuration> <container> - <containerId>tomcat6x</containerId> + <containerId>tomcat7x</containerId> </container> <configuration> <properties> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/uddi-tck/pref-rpt-1422229264251.txt ---------------------------------------------------------------------- diff --git a/uddi-tck/pref-rpt-1422229264251.txt b/uddi-tck/pref-rpt-1422229264251.txt deleted file mode 100644 index 9117eaf..0000000 --- a/uddi-tck/pref-rpt-1422229264251.txt +++ /dev/null @@ -1,12 +0,0 @@ -Insert Flat Businesses Bulk = 5.0 tx/ms -Insert Flat Businesses 1x ManyNames = 0.09740259740259741 tx/ms -Insert Flat Businesses 1x = 0.1595744680851064 tx/ms -Delete Flat Businesses Bulk ManyCategories = 1.875 tx/ms -Insert Flat Businesses Bulk ManyCategories = 0.23255813953488372 tx/ms -Delete Flat Businesses 1x ManyCategories = 0.11029411764705882 tx/ms -Delete Flat Businesses Bulk = 5.0 tx/ms -Insert Flat Businesses 1x ManyCategories = 0.019417475728155338 tx/ms -Delete Flat Businesses Bulk ManyNames = 3.75 tx/ms -Delete Flat Businesses 1x = 0.1595744680851064 tx/ms -Delete Flat Businesses 1x ManyNames = 0.1214574898785425 tx/ms -Insert Flat Businesses Bulk ManyNames = 3.0 tx/ms http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/uddi-tck/server.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/server.xml b/uddi-tck/server.xml index d361fba..3d00eb2 100644 --- a/uddi-tck/server.xml +++ b/uddi-tck/server.xml @@ -20,14 +20,18 @@ Documentation at /docs/config/server.html --> <Server port="8005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--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" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,19 +48,19 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + 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 --> <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-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) @@ -64,21 +68,21 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="8880" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="8880" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="8443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + 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 --> - + This connector uses the BIO implementation that requires the JSSE + style configuration. When using the APR/native implementation, the + OpenSSL style configuration is required as described in the APR/native + documentation --> <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="want" sslProtocol="TLS" @@ -97,8 +101,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -106,39 +110,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- 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"/> --> - <!-- 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 - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- 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 + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- 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"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- 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"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/uddi-tck/serverNode2.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/serverNode2.xml b/uddi-tck/serverNode2.xml index 4f02569..4a6b4de 100644 --- a/uddi-tck/serverNode2.xml +++ b/uddi-tck/serverNode2.xml @@ -20,14 +20,18 @@ Documentation at /docs/config/server.html --> <Server port="9005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--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" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,19 +48,19 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + 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 --> <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-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) @@ -64,26 +68,21 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port="8980" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="8980" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="9443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + 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" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> --> - + <!-- Define a SSL HTTP/1.1 Connector on port 8443 + This connector uses the BIO implementation that requires the JSSE + style configuration. When using the APR/native implementation, the + OpenSSL style configuration is required as described in the APR/native + documentation --> <Connector port="9443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="want" sslProtocol="TLS" @@ -102,8 +101,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -111,39 +110,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- 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"/> --> - <!-- 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 - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- 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 + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- 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"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- 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"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log." suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi/blob/fa39ad0d/uddi-ws/pom.xml.orig ---------------------------------------------------------------------- diff --git a/uddi-ws/pom.xml.orig b/uddi-ws/pom.xml.orig deleted file mode 100644 index 0f234e3..0000000 --- a/uddi-ws/pom.xml.orig +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -* Copyright 2001-2009 The Apache Software Foundation. -* -* Licensed 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. -* -*/ --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> -<<<<<<< HEAD - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> - </parent> - <artifactId>uddi-ws</artifactId> - <packaging>bundle</packaging> - <name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name> - <profiles> -======= - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> - <artifactId>uddi-ws</artifactId> - <packaging>bundle</packaging> - <name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name> - <profiles> ->>>>>>> 63d53d0869f8c56ef7f07bc1a09fbe4b1ab825a2 - <profile> - <id>regenerate-source</id> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <!-- version??? --> - <executions> - <execution> - <goals> - <goal>wsimport</goal> - </goals> - </execution> - </executions> - <configuration> - <wsdlDirectory>src/main/resources</wsdlDirectory> - <wsdlFiles> - <wsdlFile>uddi_v3_service.wsdl</wsdlFile> - </wsdlFiles> - <keep>true</keep> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxws_2.2_spec</artifactId> - <version>1.0</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - - <dependency> - <scope>test</scope> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>${cxf.version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
