Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 68196 Details for
Bug 105636
www-servers/tomcat and java5 / java1.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/5.0.28/java5.patch
java5.patch (text/plain), 18.66 KB, created by
Martin von Gagern
on 2005-09-11 15:01:00 UTC
(
hide
)
Description:
files/5.0.28/java5.patch
Filename:
MIME Type:
Creator:
Martin von Gagern
Created:
2005-09-11 15:01:00 UTC
Size:
18.66 KB
patch
obsolete
>diff -ur jakarta-tomcat-5.0.28-orig/jakarta-servletapi-5/jsr152/build.xml jakarta-tomcat-5.0.28-src/jakarta-servletapi-5/jsr152/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-servletapi-5/jsr152/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-servletapi-5/jsr152/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -67,7 +67,7 @@ > description="Compile API classes (Default)"> > > <!-- Java classes --> >- <javac srcdir="src/share" destdir="${jsp-api.build}/classes" >+ <javac source="1.4" target="1.4" srcdir="src/share" destdir="${jsp-api.build}/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > classpath="${servlet-api.jar}" /> >@@ -109,7 +109,7 @@ > > <!-- ======================== Build Examples =========================== --> > <target name="ant" depends="prepare"> >- <javac srcdir="src/ant" destdir="${jsp-api.build}/ant" >+ <javac source="1.4" target="1.4" srcdir="src/ant" destdir="${jsp-api.build}/ant" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > classpath="${ant.home}/lib/ant.jar" /> >@@ -199,7 +199,7 @@ > </fileset> > </txt2html> > >- <javac srcdir="examples/WEB-INF/classes" >+ <javac source="1.4" target="1.4" srcdir="examples/WEB-INF/classes" > destdir="${jsp-api.build}/examples/WEB-INF/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >@@ -207,7 +207,7 @@ > <classpath refid="examples.classpath" /> > </javac> > >- <javac srcdir="examples/plugin/applet" >+ <javac source="1.4" target="1.4" srcdir="examples/plugin/applet" > destdir="${jsp-api.build}/examples/plugin/applet" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-servletapi-5/jsr154/build.xml jakarta-tomcat-5.0.28-src/jakarta-servletapi-5/jsr154/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-servletapi-5/jsr154/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-servletapi-5/jsr154/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -62,7 +62,7 @@ > description="Compile API classes (Default)"> > > <!-- Java classes --> >- <javac srcdir="src/share" destdir="${servlet-api.build}/classes" >+ <javac source="1.4" target="1.4" srcdir="src/share" destdir="${servlet-api.build}/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}"/> > >@@ -107,7 +107,7 @@ > </fileset> > </copy> > >- <javac srcdir="examples/WEB-INF/classes" >+ <javac source="1.4" target="1.4" srcdir="examples/WEB-INF/classes" > destdir="${servlet-api.build}/examples/WEB-INF/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-5/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-5/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-5/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-5/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -327,7 +327,7 @@ > addWebXmlMappings="true" > outputDir="${admin.base}/WEB-INF/src/admin" /> > >- <javac destdir="${ROOT.base}/WEB-INF/classes" >+ <javac source="1.4" target="1.4" destdir="${ROOT.base}/WEB-INF/classes" > optimize="off" > debug="on" failonerror="false" > srcdir="${ROOT.base}/WEB-INF/src" >@@ -352,7 +352,7 @@ > </fileset> > </copy> > >- <javac destdir="${jsp-examples.base}/WEB-INF/classes" >+ <javac source="1.4" target="1.4" destdir="${jsp-examples.base}/WEB-INF/classes" > optimize="off" > debug="on" failonerror="false" > srcdir="${jsp-examples.base}/WEB-INF/src" >@@ -375,7 +375,7 @@ > <exclude name="tags/**" /> > </javac> > >- <javac destdir="${admin.base}/WEB-INF/classes" >+ <javac source="1.4" target="1.4" destdir="${admin.base}/WEB-INF/classes" > optimize="off" > debug="on" failonerror="false" > srcdir="${admin.base}/WEB-INF/src" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-5/resources/deployer/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-5/resources/deployer/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-5/resources/deployer/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-5/resources/deployer/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -49,7 +49,7 @@ > <mkdir dir="${webapp.path}/WEB-INF/classes"/> > <mkdir dir="${webapp.path}/WEB-INF/lib"/> > >- <javac destdir="${webapp.path}/WEB-INF/classes" >+ <javac source="1.4" target="1.4" destdir="${webapp.path}/WEB-INF/classes" > optimize="off" > debug="on" failonerror="false" > srcdir="${webapp.path}/WEB-INF/classes" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/catalina/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/catalina/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -588,7 +588,7 @@ > > <target name="build-catalina-core"> > <!-- Compile internal server components --> >- <javac srcdir="src/share" destdir="${classes.dir}" >+ <javac source="1.4" target="1.4" srcdir="src/share" destdir="${classes.dir}" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > excludes="**/CVS/**"> >@@ -627,7 +627,7 @@ > > <target name="build-catalina-optional" unless="build.tomcat.base"> > <!-- Compile internal server components --> >- <javac srcdir="src/share" destdir="${classes.dir}" >+ <javac source="1.4" target="1.4" srcdir="src/share" destdir="${classes.dir}" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > excludes="**/CVS/**"> >@@ -745,7 +745,7 @@ > <target name="build-tests" depends="build-main" if="junit.present"> > <mkdir dir="${catalina.build}/tests"/> > <!-- Compile unit test classes --> >- <javac srcdir="src/test" destdir="${catalina.build}/tests" >+ <javac source="1.4" target="1.4" srcdir="src/test" destdir="${catalina.build}/tests" > deprecation="off" debug="on" optimize="off" > excludes="**/CVS/**"> > <classpath refid="test.classpath"/> >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/modules/cluster/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/modules/cluster/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/modules/cluster/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/modules/cluster/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -77,7 +77,7 @@ > > <target name="build-catalina-cluster" depends="build-prepare"> > <!-- Compile internal server components --> >- <javac srcdir="${basedir}/src/share" destdir="${catalina.build}/classes" >+ <javac source="1.4" target="1.4" srcdir="${basedir}/src/share" destdir="${catalina.build}/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > excludes="**/CVS/**"> >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/tester/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/tester/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/tester/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/tester/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -58,7 +58,7 @@ > <target name="build-main" depends="build-static"> > > <!-- Compile tester components and tools --> >- <javac srcdir="src/tester" destdir="${tester.build}/classes" >+ <javac source="1.4" target="1.4" srcdir="src/tester" destdir="${tester.build}/classes" > classpath="${ant.jar}:${servlet-api.jar}:${xercesImpl.jar}" > deprecation="off" debug="on" optimize="off" > excludes="**/CVS/**"/> >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/admin/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/admin/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/admin/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/admin/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -196,7 +196,7 @@ > <!-- ================= BUILD: Compile Server Components ================= --> > <target name="build-main" depends="build-static" if="compile.admin"> > >- <javac srcdir="WEB-INF/classes" >+ <javac source="1.4" target="1.4" srcdir="WEB-INF/classes" > destdir="${webapps.build}/${webapp.name}/WEB-INF/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/balancer/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/balancer/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/balancer/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/balancer/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -59,7 +59,7 @@ > <!-- ================= BUILD: Compile Server Components ================= --> > <target name="build-main" depends="build-static"> > >- <javac srcdir="WEB-INF/classes" >+ <javac source="1.4" target="1.4" srcdir="WEB-INF/classes" > destdir="${webapps.build}/${webapp.name}/WEB-INF/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/manager/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/manager/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-catalina/webapps/manager/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/webapps/manager/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -71,7 +71,7 @@ > </fileset> > </copy> > >- <javac srcdir="WEB-INF/classes" >+ <javac source="1.4" target="1.4" srcdir="WEB-INF/classes" > destdir="${webapps.build}/${webapp.name}/WEB-INF/classes" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/coyote/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/coyote/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/coyote/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/coyote/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -197,7 +197,7 @@ > <target name="compile.shared" > description="Compile shareable components"> > <mkdir dir="${build.home}/classes"/> >- <javac srcdir="${source.home}" >+ <javac source="1.4" target="1.4" srcdir="${source.home}" > destdir="${build.home}/classes" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >@@ -215,7 +215,7 @@ > > <target name="compile.tomcat5" if="tomcat5.detect" > description="Compile Tomcat 5.x Adapter"> >- <javac srcdir="${source.home}" >+ <javac source="1.4" target="1.4" srcdir="${source.home}" > destdir="${build.home}/classes" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >@@ -243,7 +243,7 @@ > > <target name="compile.tomcat4" if="tomcat4.detect" > description="Compile Tomcat 4.x Adapter"> >- <javac srcdir="${source.home}" >+ <javac source="1.4" target="1.4" srcdir="${source.home}" > destdir="${build.home}/classes" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >@@ -258,7 +258,7 @@ > > <target name="compile.tomcat33" if="tomcat33.detect" > description="Compile Tomcat 3.3.x Adapter"> >- <javac srcdir="${source.home}" >+ <javac source="1.4" target="1.4" srcdir="${source.home}" > destdir="${build.home}/classes" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >@@ -304,7 +304,7 @@ > > <target name="compile.tests" depends="compile" > description="Compile unit test cases"> >- <javac srcdir="${test.home}" >+ <javac source="1.4" target="1.4" srcdir="${test.home}" > destdir="${build.home}/tests" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/http11/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/http11/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/http11/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/http11/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -160,7 +160,7 @@ > <target name="compile-only" > description="Compile shareable components"> > >- <javac srcdir="${source.home}" >+ <javac source="1.4" target="1.4" srcdir="${source.home}" > destdir="${build.home}/classes" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >@@ -190,7 +190,7 @@ > > <target name="compile.tests" depends="compile" > description="Compile unit test cases"> >- <javac srcdir="${test.home}/java" >+ <javac source="1.4" target="1.4" srcdir="${test.home}/java" > destdir="${build.home}/tests" > debug="${compile.debug}" > deprecation="${compile.deprecation}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/jk/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/jk/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -168,7 +168,7 @@ > > <target name="jkjava" > description="Build java side of the connector" > >- <javac srcdir="java" >+ <javac source="1.4" target="1.4" srcdir="java" > destdir="${jk.build}/classes" > deprecation="off" > debug="${debug}" >@@ -246,7 +246,7 @@ > <mkdir dir="${jk.build}/classes"/> > <mkdir dir="${jk.build}/classes/META-INF" /> > <mkdir dir="${jk.build}/lib"/> >- <javac srcdir="jkant/java" >+ <javac source="1.4" target="1.4" srcdir="jkant/java" > destdir="${jk.build}/classes" > debug="${debug}" > optimize="${optimize}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/naming/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/naming/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/naming/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/naming/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -36,7 +36,7 @@ > > <target name="main" > > <mkdir dir="${naming.build.dir}/classes"/> >- <javac srcdir="src" >+ <javac source="1.4" target="1.4" srcdir="src" > destdir="${naming.build.dir}/classes" > deprecation="off" > debug="${debug}" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/util/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/util/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-connectors/util/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/util/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -57,7 +57,7 @@ > <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/> > <echo message="-- modeler = ${modeler.present} ${commons-modeler.jar}"/> > <echo message="-- JDK14 = ${jdk1.4.present}"/> >- <javac srcdir="java" >+ <javac source="1.1" srcdir="java" > destdir="${tomcat-util.build}/classes" > deprecation="off" > debug="on" >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-jasper/jasper2/build.xml jakarta-tomcat-5.0.28-src/jakarta-tomcat-jasper/jasper2/build.xml >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-jasper/jasper2/build.xml 2005-09-11 23:45:38.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-jasper/jasper2/build.xml 2005-09-11 23:42:08.000000000 +0200 >@@ -121,7 +121,7 @@ > <property name="jasper-runtime.jar" value="${jasper.build}/shared/lib/jasper-runtime.jar"/> > > <!-- Compile internal server components --> >- <javac srcdir="src/share" destdir="${jasper.classes}" >+ <javac source="1.4" target="1.4" srcdir="src/share" destdir="${jasper.classes}" > debug="${compile.debug}" deprecation="${compile.deprecation}" > optimize="${compile.optimize}" > excludes="**/CVS/**"> >@@ -198,7 +198,7 @@ > <mkdir dir="${jasper.build}/tests"/> > <!-- Compile unit test classes --> > <!-- >- <javac srcdir="src/test" destdir="${jasper.build}/tests" >+ <javac source="1.4" target="1.4" srcdir="src/test" destdir="${jasper.build}/tests" > deprecation="off" debug="on" optimize="off" > excludes="**/CVS/**"> > <classpath refid="test.classpath"/> >diff -ur jakarta-tomcat-5.0.28-orig/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java jakarta-tomcat-5.0.28-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java >--- jakarta-tomcat-5.0.28-orig/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java 2005-09-11 23:45:08.000000000 +0200 >+++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java 2005-09-11 23:47:14.000000000 +0200 >@@ -24,6 +24,7 @@ > import java.security.CodeSource; > import java.security.PermissionCollection; > import java.security.Policy; >+import java.security.cert.Certificate; > import java.util.Collections; > import java.util.HashMap; > import java.util.Iterator; >@@ -369,7 +370,7 @@ > } > File contextDir = new File(codeBase); > URL url = contextDir.getCanonicalFile().toURL(); >- codeSource = new CodeSource(url,null); >+ codeSource = new CodeSource(url,(Certificate[])null); > permissionCollection = policy.getPermissions(codeSource); > > // Create a file read permission for web app context directory >Only in jakarta-tomcat-5.0.28-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler: JspRuntimeContext.java~
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=68196">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 105636
:
68195
| 68196 |
68197
|
68997
|
68998
