[g...@vmgump]: Project tomcat-catalina (in module jakarta-tomcat-4.0) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-catalina has an issue affecting its community integration. This issue affects 3 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation - jakarta-tomcat-coyote-tomcat4 : Connectors to various web servers - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [catalina.jar] identifier set to project name -DEBUG- Dependency on jakarta-servletapi-4 exists, no need to add for property servlet.jar. -DEBUG- Dependency on commons-logging exists, no need to add for property commons-logging-api.jar. -DEBUG- Dependency on jakarta-regexp exists, no need to add for property regexp.jar. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/jakarta-tomcat-4.0/tomcat-catalina/gump_work/build_jakarta-tomcat-4.0_tomcat-catalina.html Work Name: build_jakarta-tomcat-4.0_tomcat-catalina (Type: Build) Work ended in a state of : Failed Elapsed: 16 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dcommons-beanutils.jar=/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-03072009.jar -Djtc.home=/srv/gump/public/workspace/jakarta-tomcat-connectors -Dversion=4.1.25-dev -Dregexp.jar=/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-03072009.jar -Dcommons-logging-api.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-03072009.jar -Dservlet.jar=/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar -Dcommons-logging.jar=/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-03072009.jar -Dcommons-collections.jar=/srv/gump/public/workspace/apache-commons/collection s/build/commons-collections-03072009.jar -Dcommons-digester.jar=/srv/gump/public/workspace/apache-commons/digester/dist/commons-digester.jar deploy-catalina [Working Directory: /srv/gump/public/workspace/jakarta-tomcat-4.0/catalina] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/jakarta-tomcat-connectors/util/build/lib/tomcat-util.jar:/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-03072009.jar:/srv/gump/public/workspace/apache-commons/fileupload/target/commons-fileupload-03072009.jar:/srv/gump/public/workspace/apache-commons/collecti ons/build/commons-collections-03072009.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-03072009.jar:/srv/gump/public/workspace/apache-commons/digester/dist/commons-digester.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-03072009.jar - [javac] symbol : class HttpSessionAttributeListener [javac] location: class org.apache.catalina.session.StandardSession [javac] if (!(listeners[i] instanceof HttpSessionAttributeListener)) [javac] ^ [javac] /srv/gump/public/workspace/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java:1142: cannot find symbol [javac] symbol : class HttpSessionAttributeListener [javac] location: class org.apache.catalina.session.StandardSession [javac] HttpSessionAttributeListener listener = [javac] ^ [javac]
DO NOT REPLY [Bug 47472] Use the mod_jk-1.2.28 nonsupport virtualhost
https://issues.apache.org/bugzilla/show_bug.cgi?id=47472 --- Comment #2 from wpm wpm...@gmail.com 2009-07-04 02:08:20 PST --- Thanks -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java
Author: markt
Date: Sat Jul 4 15:46:47 2009
New Revision: 791139
URL: http://svn.apache.org/viewvc?rev=791139view=rev
Log:
Fix generics warnings
Modified:
tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=791139r1=791138r2=791139view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Sat Jul 4
15:46:47 2009
@@ -51,7 +51,7 @@
return this.target.getVariableMapper();
}
-public Object getContext(Class key) {
+public Object getContext(Class? key) {
return this.target.getContext(key);
}
@@ -63,7 +63,7 @@
return this.target.isPropertyResolved();
}
-public void putContext(Class key, Object contextObject) throws
NullPointerException {
+public void putContext(Class? key, Object contextObject) throws
NullPointerException {
this.target.putContext(key, contextObject);
}
Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=791139r1=791138r2=791139view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Sat Jul
4 15:46:47 2009
@@ -34,7 +34,7 @@
this.factory = factory;
}
- public Expression parseExpression(String expression, Class expectedType,
+ public Expression parseExpression(String expression, Class?
expectedType,
FunctionMapper fMapper) throws ELException {
try {
ELContextImpl ctx =
@@ -49,7 +49,7 @@
}
}
- public Object evaluate(String expression, Class expectedType,
+ public Object evaluate(String expression, Class? expectedType,
VariableResolver vResolver, FunctionMapper fMapper)
throws ELException {
return this.parseExpression(expression, expectedType,
fMapper).evaluate(vResolver);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791142 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java servlet/JasperLoader.java
Author: markt
Date: Sat Jul 4 15:55:48 2009
New Revision: 791142
URL: http://svn.apache.org/viewvc?rev=791142view=rev
Log:
Remove some unused code
Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=791142r1=791141r2=791142view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sat Jul 4
15:55:48 2009
@@ -179,8 +179,7 @@
jspLoader = new JasperLoader
(new URL[] {baseUrl},
getClassLoader(),
-rctxt.getPermissionCollection(),
-rctxt.getCodeSource());
+rctxt.getPermissionCollection());
}
return jspLoader;
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=791142r1=791141r2=791142view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java Sat Jul 4
15:55:48 2009
@@ -37,17 +37,13 @@
public class JasperLoader extends URLClassLoader {
private PermissionCollection permissionCollection;
-private CodeSource codeSource;
-private String className;
private ClassLoader parent;
private SecurityManager securityManager;
public JasperLoader(URL[] urls, ClassLoader parent,
-PermissionCollection permissionCollection,
-CodeSource codeSource) {
+PermissionCollection permissionCollection) {
super(urls, parent);
this.permissionCollection = permissionCollection;
-this.codeSource = codeSource;
this.parent = parent;
this.securityManager = System.getSecurityManager();
}
@@ -148,7 +144,7 @@
try {
is = url.openStream();
} catch (IOException e) {
-is = null;
+// Ignore
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791144 - /tomcat/trunk/java/org/apache/jasper/JspC.java
Author: markt
Date: Sat Jul 4 15:59:05 2009
New Revision: 791144
URL: http://svn.apache.org/viewvc?rev=791144view=rev
Log:
Deprecation fixes
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=791144r1=791143r2=791144view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Sat Jul 4 15:59:05 2009
@@ -1283,7 +1283,7 @@
String path = tokenizer.nextToken();
try {
File libFile = new File(path);
-urls.add(libFile.toURL());
+urls.add(libFile.toURI().toURL());
} catch (IOException ioe) {
// Failing a toCanonicalPath on a file that
// exists() should be a JVM regression test,
@@ -1299,7 +1299,7 @@
if (classes.exists()) {
classPath = classPath + File.pathSeparator
+ classes.getCanonicalPath();
-urls.add(classes.getCanonicalFile().toURL());
+urls.add(classes.getCanonicalFile().toURI().toURL());
}
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
@@ -1324,7 +1324,7 @@
File libFile = new File(lib, libs[i]);
classPath = classPath + File.pathSeparator
+ libFile.getAbsolutePath();
-urls.add(libFile.getAbsoluteFile().toURL());
+urls.add(libFile.getAbsoluteFile().toURI().toURL());
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
// exists() should be a JVM regression test,
@@ -1336,7 +1336,8 @@
}
// What is this ??
-urls.add(new File(clctxt.getRealPath(/)).getCanonicalFile().toURL());
+urls.add(new File(
+clctxt.getRealPath(/)).getCanonicalFile().toURI().toURL());
URL urlsA[]=new URL[urls.size()];
urls.toArray(urlsA);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791150 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jul 4 16:28:30 2009 New Revision: 791150 URL: http://svn.apache.org/viewvc?rev=791150view=rev Log: proposal Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791150r1=791149r2=791150view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jul 4 16:28:30 2009 @@ -77,3 +77,9 @@ http://people.apache.org/~markt/patches/2009-07-02-bug38743.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149 + Explicitly specify encoding for the source files + http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_encodings.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47149] Build fail (encoding error)on Chinese version Windows XP OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=47149 --- Comment #9 from Konstantin Kolinko knst.koli...@gmail.com 2009-07-04 09:40:00 PST --- Fixed in trunk, proposed for 6.0, 5.5. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791159 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jul 4 18:06:57 2009 New Revision: 791159 URL: http://svn.apache.org/viewvc?rev=791159view=rev Log: proposal Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791159r1=791158r2=791159view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jul 4 18:06:57 2009 @@ -83,3 +83,12 @@ http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_encodings.patch +1: kkolinko -1: + +* Document minimum required Ant version to be 1.6.2, instead of 1.5.x + Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already + mentions 1.6.2 since rev.351798, thus for more than 3.5 years. + (Though it is a docs patch, I think it is an important change) + Patch for BUILDING.txt: + http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Minimum Ant version for Tomcat 5.5 (was Re: svn commit: r791159)
New Revision: 791159 URL: http://svn.apache.org/viewvc?rev=791159view=rev Log: proposal + +* Document minimum required Ant version to be 1.6.2, instead of 1.5.x + Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already + mentions 1.6.2 since rev.351798, thus for more than 3.5 years. + (Though it is a docs patch, I think it is an important change) + Patch for BUILDING.txt: + http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch + +1: kkolinko + -1: If anybody thinks that we should support Ant 1.5.x for building TC 5.5, please say so. Though maybe it is already not possible to use it - I have not tried. If so, I would update the docs right away. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java
2009/7/4 ma...@apache.org: Author: markt Date: Sat Jul 4 15:46:47 2009 New Revision: 791139 URL: http://svn.apache.org/viewvc?rev=791139view=rev Log: Fix generics warnings Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Eclipse IDE has two complaints after this change (and flags them as compilation errors), that * Name clash: The method getContext(Class?) of type ELContextWrapper has the same erasure as getContext(Class) of type ELContext but does not override it * Name clash: The method putContext(Class?, Object) of type ELContextWrapper has the same erasure as putContext(Class, Object) of type ELContext but does not override it It can be solved by updating declarations of those methods in class ELContext, s/ Class / Class? / Maybe you have already done so, but have not committed yet? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791162 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jul 4 18:56:08 2009 New Revision: 791162 URL: http://svn.apache.org/viewvc?rev=791162view=rev Log: proposal Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791162r1=791161r2=791162view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jul 4 18:56:08 2009 @@ -92,3 +92,13 @@ http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch +1: kkolinko -1: + +* Patch for fixcrlf tasks: + * Specify explicit encoding, instead of using the platform default one + * Don't add blank lines to files + * Added **/*.rtf to the list of exclusions and sorted it alphabetically. + (We have a License.rtf file) + Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only. + http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_fixcrlf.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791184 - /tomcat/trunk/dist.xml
Author: kkolinko
Date: Sat Jul 4 22:58:08 2009
New Revision: 791184
URL: http://svn.apache.org/viewvc?rev=791184view=rev
Log:
Added **/*.rtf to the list of exclusions and sorted it alphabetically.
(We have a License.rtf file)
Modified:
tomcat/trunk/dist.xml
Modified: tomcat/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=791184r1=791183r2=791184view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Sat Jul 4 22:58:08 2009
@@ -702,7 +702,7 @@
!-- Packages the source code distribution in tar.gz format --
target name=package-src-tgz
fixcrlf srcdir=${tomcat.dist}/src
-
excludes=**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia
+
excludes=**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war
eol=lf encoding=ISO-8859-1 fixlast=false /
tar longfile=gnu compression=gzip
tarfile=${tomcat.release}/v${version}/src/${final-src.name}.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791185 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jul 4 22:59:57 2009 New Revision: 791185 URL: http://svn.apache.org/viewvc?rev=791185view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791185r1=791184r2=791185view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jul 4 22:59:57 2009 @@ -145,3 +145,8 @@ http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_encodings.patch +1: kkolinko -1: + +* Add *.rtf to the list of exclusions in fixcrlf task. + http://svn.apache.org/viewvc?rev=791184view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791186 - in /tomcat/trunk/java: javax/el/ELContext.java org/apache/el/lang/EvaluationContext.java
Author: kkolinko
Date: Sat Jul 4 23:10:05 2009
New Revision: 791186
URL: http://svn.apache.org/viewvc?rev=791186view=rev
Log:
Fix generics warnings
Modified:
tomcat/trunk/java/javax/el/ELContext.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
Modified: tomcat/trunk/java/javax/el/ELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=791186r1=791185r2=791186view=diff
==
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Sat Jul 4 23:10:05 2009
@@ -39,14 +39,14 @@
this.resolved = false;
}
-public Object getContext(Class key) {
+public Object getContext(Class? key) {
if (this.map == null) {
return null;
}
return this.map.get(key);
}
-public void putContext(Class key, Object contextObject) throws
NullPointerException {
+public void putContext(Class? key, Object contextObject) throws
NullPointerException {
if (key == null || contextObject == null) {
throw new NullPointerException();
}
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=791186r1=791185r2=791186view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Sat Jul 4
23:10:05 2009
@@ -51,7 +51,7 @@
return this.varMapper;
}
-public Object getContext(Class key) {
+public Object getContext(Class? key) {
return this.elContext.getContext(key);
}
@@ -63,7 +63,7 @@
return this.elContext.isPropertyResolved();
}
-public void putContext(Class key, Object contextObject) {
+public void putContext(Class? key, Object contextObject) {
this.elContext.putContext(key, contextObject);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java
2009/7/4 Konstantin Kolinko knst.koli...@gmail.com: 2009/7/4 ma...@apache.org: Author: markt Date: Sat Jul 4 15:46:47 2009 New Revision: 791139 URL: http://svn.apache.org/viewvc?rev=791139view=rev Log: Fix generics warnings Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Eclipse IDE has two complaints after this change (and flags them as compilation errors), that * Name clash: The method getContext(Class?) of type ELContextWrapper has the same erasure as getContext(Class) of type ELContext but does not override it * Name clash: The method putContext(Class?, Object) of type ELContextWrapper has the same erasure as putContext(Class, Object) of type ELContext but does not override it It can be solved by updating declarations of those methods in class ELContext, s/ Class / Class? / Maybe you have already done so, but have not committed yet? Fixed it myself, in rev.791186. Don't worry. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791188 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jul 4 23:29:09 2009 New Revision: 791188 URL: http://svn.apache.org/viewvc?rev=791188view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791188r1=791187r2=791188view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jul 4 23:29:09 2009 @@ -150,3 +150,10 @@ http://svn.apache.org/viewvc?rev=791184view=rev +1: kkolinko -1: + +* Remove build-webapps-precompile target from dist.xml + Discussion: http://markmail.org/thread/ymgbgqm3lav6rnjh + Patch: + http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_remove-webapps-precompile.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791192 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sun Jul 5 00:12:25 2009 New Revision: 791192 URL: http://svn.apache.org/viewvc?rev=791192view=rev Log: proposal Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791192r1=791191r2=791192view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sun Jul 5 00:12:25 2009 @@ -102,3 +102,8 @@ http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_fixcrlf.patch +1: kkolinko -1: + +* Specify explicit encoding when performing filtering in copy and replace tasks + http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_copy-encodings.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791194 - in /tomcat/trunk: build.xml extras.xml
Author: kkolinko
Date: Sun Jul 5 00:17:22 2009
New Revision: 791194
URL: http://svn.apache.org/viewvc?rev=791194view=rev
Log:
Specify explicit encoding when performing replace task.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/extras.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=791194r1=791193r2=791194view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jul 5 00:17:22 2009
@@ -848,11 +848,13 @@
exclude name=**/managed/** /
/fileset
/copy
-replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
+replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
+encoding=ISO-8859-1
replacefilter token=org.apache.commons
value=org.apache.tomcat.dbcp /
/replace
-replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl
+replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl
+encoding=ISO-8859-1
replacefilter token=enum
value=enumeration /
/replace
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=791194r1=791193r2=791194view=diff
==
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Sun Jul 5 00:17:22 2009
@@ -109,7 +109,8 @@
untar src=${tomcat.extras}/logging/commons-logging-src.tar
dest=${tomcat.extras}/logging//
-replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons
+replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons
+encoding=ISO-8859-1
replacefilter token=org.apache.commons
value=org.apache.juli /
/replace
@@ -118,7 +119,8 @@
fileset
dir=${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons
/
/move
-replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src
+replace
dir=${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src
+encoding=ISO-8859-1
replacefilter token=org.apache.commons
value=org.apache.juli /
replacefilter token=org/apache/commons/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791195 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Jul 5 00:18:49 2009 New Revision: 791195 URL: http://svn.apache.org/viewvc?rev=791195view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791195r1=791194r2=791195view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jul 5 00:18:49 2009 @@ -157,3 +157,8 @@ http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_remove-webapps-precompile.patch +1: kkolinko -1: + +* Specify explicit encoding when performing replace task + http://svn.apache.org/viewvc?rev=791194view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
