[pkg-java] r6174 - in trunk/tomcat5.5: . build build/resources connectors/util connectors/util/java/org/apache/tomcat/util/net/jsse container/catalina container/catalina/src/bin container/catalina/src/share/org/apache/naming/factory container/webapps/admin
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Tue Apr 15 05:42:47 UTC 2008
Author: mkoch
Date: 2008-04-15 05:42:46 +0000 (Tue, 15 Apr 2008)
New Revision: 6174
Added:
trunk/tomcat5.5/build/resources/log4j.properties
Modified:
trunk/tomcat5.5/build.xml
trunk/tomcat5.5/build/build.xml
trunk/tomcat5.5/connectors/util/build.xml
trunk/tomcat5.5/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
trunk/tomcat5.5/container/catalina/build.xml
trunk/tomcat5.5/container/catalina/src/bin/catalina.sh
trunk/tomcat5.5/container/catalina/src/share/org/apache/naming/factory/Constants.java
trunk/tomcat5.5/container/webapps/admin/build.xml
Log:
- apply patch from from diff.gz of latest debian version to SVN (from 5.5.25-5)
Modified: trunk/tomcat5.5/build/build.xml
===================================================================
--- trunk/tomcat5.5/build/build.xml 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/build/build.xml 2008-04-15 05:42:46 UTC (rev 6174)
@@ -176,12 +176,11 @@
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
failonerror="false" />
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
+<!-- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />-->
<!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
<copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
- <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
</target>
<!-- ====================== Build all components =================== -->
@@ -293,6 +292,8 @@
<ant dir="${jtc.home}/jk/jkstatus" target="dist">
<property name="catalina.build" value="${tomcat.build}"/>
<property name="jtc.home" value="${jtc.home}"/>
+ <property name="jk.build" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/build"/>
+ <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
</ant>
<!-- jkstatus ant API -->
@@ -300,6 +301,7 @@
<ant dir="${jtc.home}/jk/jkstatus" target="copy">
<property name="catalina.build" value="${tomcat.build}"/>
<property name="jtc.home" value="${jtc.home}"/>
+ <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
</ant>
</target>
@@ -671,29 +673,6 @@
<!-- <antcall target="build-commons-modeler" /> -->
<!-- <antcall target="build-commons-daemon" /> -->
-
- <!--<antcall target="downloadgz">
- <param name="sourcefile" value="${commons-collections-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
- -->
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
-
- <antcall target="build-tomcat-dbcp" />
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${jdt.loc}"/>
- <param name="destfile" value="${jdt.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- <antcall target="build-jasper-compiler-jdt" />
</target>
<target name="build-tomcat-dbcp">
@@ -1956,12 +1935,6 @@
<param name="destfile" value="${commons-launcher.jar}"/>
</antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${nsis.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}"/>
- </antcall>
-
<antcall target="downloadgz">
<param name="sourcefile" value="${struts.loc}"/>
<param name="destfile" value="${struts.jar}"/>
@@ -1972,12 +1945,6 @@
<param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.loc}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
<!-- Build the dependencies that are not yet released -->
<antcall target="build-depends"/>
@@ -2000,6 +1967,8 @@
<target name="testexist">
<echo message="Testing for ${destfile}"/>
<available file="${destfile}" property="exist"/>
+ <fail unless="exist"
+ message="Required file not found, and downloading disabled" />
</target>
<target name="downloadgz" unless="exist" depends="setproxy,testexist">
Added: trunk/tomcat5.5/build/resources/log4j.properties
===================================================================
--- trunk/tomcat5.5/build/resources/log4j.properties (rev 0)
+++ trunk/tomcat5.5/build/resources/log4j.properties 2008-04-15 05:42:46 UTC (rev 6174)
@@ -0,0 +1,9 @@
+log4j.rootCategory=info, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%r [%t] %-5p\: %-15c{2} - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+#log4j.category.org.apache.catalina=info
+
+#log4j.category.org.apache.jasper.compiler.Compiler=debug
Modified: trunk/tomcat5.5/build.xml
===================================================================
--- trunk/tomcat5.5/build.xml 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/build.xml 2008-04-15 05:42:46 UTC (rev 6174)
@@ -64,7 +64,7 @@
description="Builds all components">
<ant dir="${tomcat.home}" target="download" />
- <ant dir="${tomcat.home}" target="deploy" />
+ <ant dir="${tomcat.home}" target="dist" />
</target>
Modified: trunk/tomcat5.5/connectors/util/build.xml
===================================================================
--- trunk/tomcat5.5/connectors/util/build.xml 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/connectors/util/build.xml 2008-04-15 05:42:46 UTC (rev 6174)
@@ -86,11 +86,14 @@
<javac srcdir="java"
destdir="${tomcat-util.build}/classes"
deprecation="${compile.deprecation}"
+ source="${compile.source}"
debug="${compile.debug}"
optimize="off"
verbose="off"
- excludes="**/CVS/**">
+ nowarn="true">
<classpath refid="compile.classpath"/>
+ <exclude name="**/CVS/**" />
+ <exclude name="**/JSSE13*.java" />
<exclude name="**/util/net/jsse/*" unless="jsse.present"/>
<exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
<exclude name="**/util/net/puretls/*" unless="puretls.present"/>
Modified: trunk/tomcat5.5/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
===================================================================
--- trunk/tomcat5.5/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2008-04-15 05:42:46 UTC (rev 6174)
@@ -37,8 +37,6 @@
"org.apache.tomcat.util.net.jsse.JSSE15Factory";
static final String JSSE14Factory =
"org.apache.tomcat.util.net.jsse.JSSE14Factory";
- static final String JSSE13Factory =
- "org.apache.tomcat.util.net.jsse.JSSE13Factory";
static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
static org.apache.commons.logging.Log logger =
@@ -68,7 +66,9 @@
}
}
} if(factory == null) {
- factory = new JSSE13Factory();
+ if(logger.isDebugEnabled()) {
+ logger.debug("Error getting JDK 14/15 factory - JDK 1.3 is not supported by Debian package !");
+ }
}
}
Modified: trunk/tomcat5.5/container/catalina/build.xml
===================================================================
--- trunk/tomcat5.5/container/catalina/build.xml 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/container/catalina/build.xml 2008-04-15 05:42:46 UTC (rev 6174)
@@ -566,8 +566,6 @@
<!--
<copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
-->
- <copy todir="${catalina.build}/common/lib"
- file="${tomcat-dbcp.jar}" />
<!-- Configuration Files -->
<copy todir="${catalina.build}/conf">
Modified: trunk/tomcat5.5/container/catalina/src/bin/catalina.sh
===================================================================
--- trunk/tomcat5.5/container/catalina/src/bin/catalina.sh 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/container/catalina/src/bin/catalina.sh 2008-04-15 05:42:46 UTC (rev 6174)
@@ -130,8 +130,11 @@
fi
fi
+gcj=no
+"$_RUNJAVA" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gcj=yes
+
# Add on extra jar files to CLASSPATH
-if [ -n "$JSSE_HOME" ]; then
+if [ -n "$JSSE_HOME" -a "$gcj" != "yes" ]; 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
@@ -164,7 +167,8 @@
fi
# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
+# Dont use juli LogManager when running with gcj
+if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar -a "$gcj" != "yes" ]; then
JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
fi
@@ -256,6 +260,12 @@
shift
touch "$CATALINA_BASE"/logs/catalina.out
if [ "$1" = "-security" ] ; then
+ if [ "$gcj" = "yes" ]; then
+ echo "The java-gcj-compat-dev environment currently doesn't support"
+ echo "a security manager. Please check the TOMCAT5_SECURITY variable"
+ echo "in /etc/default/tomcat5.5."
+ exit 1
+ fi
echo "Using Security Manager"
shift
"$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
Modified: trunk/tomcat5.5/container/catalina/src/share/org/apache/naming/factory/Constants.java
===================================================================
--- trunk/tomcat5.5/container/catalina/src/share/org/apache/naming/factory/Constants.java 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/container/catalina/src/share/org/apache/naming/factory/Constants.java 2008-04-15 05:42:46 UTC (rev 6174)
@@ -43,7 +43,7 @@
Package + ".EjbFactory";
public static final String DBCP_DATASOURCE_FACTORY =
- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
+ "org.apache.commons.dbcp.BasicDataSourceFactory";
public static final String OPENEJB_EJB_FACTORY =
Package + ".OpenEjbFactory";
Modified: trunk/tomcat5.5/container/webapps/admin/build.xml
===================================================================
--- trunk/tomcat5.5/container/webapps/admin/build.xml 2008-04-14 23:27:15 UTC (rev 6173)
+++ trunk/tomcat5.5/container/webapps/admin/build.xml 2008-04-15 05:42:46 UTC (rev 6174)
@@ -197,10 +197,6 @@
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="flags,flags.display,build-prepare,copy-struts.jar">
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-beanutils.jar}"/>
- <copy tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"
- file="${commons-collections.jar}"/>
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-digester.jar}"/>
<copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
More information about the pkg-java-commits
mailing list