svn propchange: r894720 - svn:log
Author: markt Revision: 894720 Modified property: svn:log Modified: svn:log at Thu Dec 31 09:05:32 2009 -- --- svn:log (original) +++ svn:log Thu Dec 31 09:05:32 2009 @@ -1,2 +1,4 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43819 Implement ExpressionFactory.newInstance() and ensure that Jasper does not refer to org.apache.el directly JSP 2.1 TCK passes with these changes applied +Based on a patch by Christoph Beck - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43819 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2009-12-31 01:05:49 GMT --- This has been fixed in trunk and will be included in 7.0.0 onwards. The patch applied was based on attachment 21099. The patch was not used directly for a couple of reasons: - it doesn't ensure InputStreams are closed - it caused JSP 2.1 TCK failures Attachment 21454 was ignored because: - it was not required - it does not make Jasper independent of o.a.el -- 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
DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 --- Comment #1 from Mark Thomas 2009-12-31 01:21:51 GMT --- The preferred format for patches is diff -u The screen shot is unnecessary and makes the attachment 50 times bigger than it needs to be. I am -1 for the patch as is since it makes Title a mandatory parameter for catalina.bat. This would be an added nuisance for far more users that it would benefit. I'd suggest using an environment variable for the title that defaults to Tomcat -- 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: r894805 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Thu Dec 31 10:46:24 2009
New Revision: 894805
URL: http://svn.apache.org/viewvc?rev=894805&view=rev
Log:
Update X-Powered-By header for Servlet 3.0 / JSP 2.2 and add additional
information as suggested by the Servlet Spec and
https://issues.apache.org/bugzilla/show_bug.cgi?id=48006
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=894805&r1=894804&r2=894805&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Dec
31 10:46:24 2009
@@ -30,6 +30,7 @@
import org.apache.tomcat.util.res.StringManager;
import org.apache.catalina.comet.CometEvent;
import org.apache.catalina.core.AsyncContextImpl;
+import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Adapter;
@@ -54,9 +55,13 @@
* @version $Revision$ $Date$
*/
-public class CoyoteAdapter
-implements Adapter
- {
+public class CoyoteAdapter implements Adapter {
+
+private static final String POWERED_BY = "Servlet/3.0 JSP/2.2 " +
+"(" + ServerInfo.getServerInfo() + " Java/" +
+System.getProperty("java.vm.vendor") + "/" +
+System.getProperty("java.runtime.version") + ")";
+
private static final Log log = LogFactory.getLog(CoyoteAdapter.class);
// -- Constants
@@ -367,7 +372,7 @@
}
if (connector.getXpoweredBy()) {
-response.addHeader("X-Powered-By", "Servlet/2.5");
+response.addHeader("X-Powered-By", POWERED_BY);
}
boolean comet = false;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r894806 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 31 10:47:59 2009 New Revision: 894806 URL: http://svn.apache.org/viewvc?rev=894806&view=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=894806&r1=894805&r2=894806&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 31 10:47:59 2009 @@ -112,7 +112,7 @@ -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48417 - Correct French trabslations + Correct French translations Patches provided by André Warnier http://svn.apache.org/viewvc?rev=894586&view=rev +1: markt @@ -132,3 +132,11 @@ http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4800 + Update X-Powered-By header to include information sugegsted by the Servlet + spec + http://svn.apache.org/viewvc?rev=894805&view=rev + (Modify spec versions to align with Tomcat 6) + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48006] Implement the header X-Powered-By suggested by the servlet specification
https://issues.apache.org/bugzilla/show_bug.cgi?id=48006 --- Comment #3 from Mark Thomas 2009-12-31 02:47:58 GMT --- Note that you can modify the server header to display anything you want to. The updated X-Powered-By header has been fixed in trunk and proposed for 6.0.x -- 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: r894811 - /tomcat/trunk/java/org/apache/catalina/startup/Constants.java
Author: markt Date: Thu Dec 31 10:54:17 2009 New Revision: 894811 URL: http://svn.apache.org/viewvc?rev=894811&view=rev Log: Re-order constants to match DigestFactory usage to make it easier to check for consistency Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=894811&r1=894810&r2=894811&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Dec 31 10:54:17 2009 @@ -38,6 +38,48 @@ public static final String HostContextXml = "context.xml.default"; public static final String HostWebXml = "web.xml.default"; +// J2EE +public static final String J2eeSchemaPublicId_14 = +"j2ee_1_4.xsd"; +public static final String J2eeSchemaResourcePath_14 = +"/javax/servlet/resources/j2ee_1_4.xsd"; + +public static final String JavaeeSchemaPublicId_5 = +"javaee_5.xsd"; +public static final String JavaeeSchemaResourcePath_5 = +"/javax/servlet/resources/javaee_5.xsd"; + + +// W3C +public static final String W3cSchemaPublicId_10 = +"xml.xsd"; +public static final String W3cSchemaResourcePath_10 = +"/javax/servlet/resources/xml.xsd"; + +public static final String W3cSchemaDTDPublicId_10 = +"XMLSchema.dtd"; +public static final String W3cSchemaDTDResourcePath_10 = +"/javax/servlet/resources/XMLSchema.dtd"; + +public static final String W3cDatatypesDTDPublicId_10 = +"datatypes.dtd"; +public static final String W3cDatatypesDTDResourcePath_10 = +"/javax/servlet/resources/datatypes.dtd"; + + +// JSP +public static final String JspSchemaPublicId_20 = +"jsp_2_0.xsd"; +public static final String JspSchemaResourcePath_20 = +"/javax/servlet/jsp/resources/jsp_2_0.xsd"; + +public static final String JspSchemaPublicId_21 = +"jsp_2_1.xsd"; +public static final String JspSchemaResourcePath_21 = +"/javax/servlet/jsp/resources/jsp_2_1.xsd"; + + +// TLD public static final String TldDtdPublicId_11 = "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"; public static final String TldDtdResourcePath_11 = @@ -58,6 +100,8 @@ public static final String TldSchemaResourcePath_21 = "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd"; + +// web.xml public static final String WebDtdPublicId_22 = "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"; public static final String WebDtdResourcePath_22 = @@ -78,41 +122,8 @@ public static final String WebSchemaResourcePath_25 = "/javax/servlet/resources/web-app_2_5.xsd"; -public static final String J2eeSchemaPublicId_14 = -"j2ee_1_4.xsd"; -public static final String J2eeSchemaResourcePath_14 = -"/javax/servlet/resources/j2ee_1_4.xsd"; - -public static final String JavaeeSchemaPublicId_5 = -"javaee_5.xsd"; -public static final String JavaeeSchemaResourcePath_5 = -"/javax/servlet/resources/javaee_5.xsd"; - -public static final String W3cSchemaPublicId_10 = -"xml.xsd"; -public static final String W3cSchemaResourcePath_10 = -"/javax/servlet/resources/xml.xsd"; - -public static final String W3cSchemaDTDPublicId_10 = -"XMLSchema.dtd"; -public static final String W3cSchemaDTDResourcePath_10 = -"/javax/servlet/resources/XMLSchema.dtd"; - -public static final String W3cDatatypesDTDPublicId_10 = -"datatypes.dtd"; -public static final String W3cDatatypesDTDResourcePath_10 = -"/javax/servlet/resources/datatypes.dtd"; - -public static final String JspSchemaPublicId_20 = -"jsp_2_0.xsd"; -public static final String JspSchemaResourcePath_20 = -"/javax/servlet/jsp/resources/jsp_2_0.xsd"; - -public static final String JspSchemaPublicId_21 = -"jsp_2_1.xsd"; -public static final String JspSchemaResourcePath_21 = -"/javax/servlet/jsp/resources/jsp_2_1.xsd"; +// Web service public static final String J2eeWebServiceSchemaPublicId_11 = "j2ee_web_services_1_1.xsd"; public static final String J2eeWebServiceSchemaResourcePath_11 = - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r894813 - in /tomcat/trunk/java/org/apache/catalina/startup: Constants.java DigesterFactory.java
Author: markt Date: Thu Dec 31 11:05:45 2009 New Revision: 894813 URL: http://svn.apache.org/viewvc?rev=894813&view=rev Log: Add the Java EE 6 schemas to support validation Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=894813&r1=894812&r2=894813&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Dec 31 11:05:45 2009 @@ -49,6 +49,11 @@ public static final String JavaeeSchemaResourcePath_5 = "/javax/servlet/resources/javaee_5.xsd"; +public static final String JavaeeSchemaPublicId_6 = +"javaee_6.xsd"; +public static final String JavaeeSchemaResourcePath_6 = +"/javax/servlet/resources/javaee_6.xsd"; + // W3C public static final String W3cSchemaPublicId_10 = @@ -77,7 +82,12 @@ "jsp_2_1.xsd"; public static final String JspSchemaResourcePath_21 = "/javax/servlet/jsp/resources/jsp_2_1.xsd"; - + +public static final String JspSchemaPublicId_22 = +"jsp_2_2.xsd"; +public static final String JspSchemaResourcePath_22 = +"/javax/servlet/jsp/resources/jsp_2_2.xsd"; + // TLD public static final String TldDtdPublicId_11 = @@ -122,6 +132,20 @@ public static final String WebSchemaResourcePath_25 = "/javax/servlet/resources/web-app_2_5.xsd"; +public static final String WebSchemaPublicId_30 = +"web-app_3_0.xsd"; +public static final String WebSchemaResourcePath_30 = +"/javax/servlet/resources/web-app_3_0.xsd"; + +public static final String WebCommonSchemaPublicId_30 = +"web-common_3_0.xsd"; +public static final String WebCommonSchemaResourcePath_30 = +"/javax/servlet/resources/web-common_3_0.xsd"; + +public static final String WebFragmentSchemaPublicId_30 = +"web-fragment_3_0.xsd"; +public static final String WebFragmentSchemaResourcePath_30 = +"/javax/servlet/resources/web-fragment_3_0.xsd"; // Web service public static final String J2eeWebServiceSchemaPublicId_11 = @@ -144,4 +168,14 @@ public static final String JavaeeWebServiceClientSchemaResourcePath_12 = "/javax/servlet/resources/javaee_web_services_client_1_2.xsd"; +public static final String JavaeeWebServiceSchemaPublicId_13 = +"javaee_web_services_1_3.xsd"; +public static final String JavaeeWebServiceSchemaResourcePath_13 = +"/javax/servlet/resources/javaee_web_services_1_3.xsd"; + +public static final String JavaeeWebServiceClientSchemaPublicId_13 = +"javaee_web_services_client_1_3.xsd"; +public static final String JavaeeWebServiceClientSchemaResourcePath_13 = +"/javax/servlet/resources/javaee_web_services_client_1_3.xsd"; + } Modified: tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=894813&r1=894812&r2=894813&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Thu Dec 31 11:05:45 2009 @@ -95,6 +95,10 @@ Constants.JavaeeSchemaPublicId_5, schemaResolver); +register(Constants.JavaeeSchemaResourcePath_6, +Constants.JavaeeSchemaPublicId_6, +schemaResolver); + // W3C register(Constants.W3cSchemaResourcePath_10, Constants.W3cSchemaPublicId_10, @@ -117,6 +121,10 @@ Constants.JspSchemaPublicId_21, schemaResolver); +register(Constants.JspSchemaResourcePath_22, +Constants.JspSchemaPublicId_22, +schemaResolver); + // TLD register(Constants.TldDtdResourcePath_11, Constants.TldDtdPublicId_11, @@ -151,6 +159,18 @@ Constants.WebSchemaPublicId_25, schemaResolver); +register(Constants.WebSchemaResourcePath_30, +Constants.WebSchemaPublicId_30, +schemaResolver); + +register(Constants.WebCommonSchemaResourcePath_30, +Constants.WebCommonSchemaPublicId_30, +schemaResolver); + +register(Constants.WebFragmentSchemaResourcePath_30, +Constants.WebFragmentSchemaPublicId_30, +schemaResolver); + // Web Service register(Constants.J2eeWebServiceSchemaReso
DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 LiuYan changed: What|Removed |Added Attachment #24780|0 |1 is obsolete|| --- Comment #2 from LiuYan 2009-12-31 04:04:48 UTC --- Created an attachment (id=24784) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24784) Patches for startup.bat(svn#562770), catelina.bat(svn#885002) -t, -title: specify a title -tt, -timetitle: specify a title, and append current time to title -- 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
DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 --- Comment #3 from Mark Thomas 2009-12-31 04:17:25 GMT --- Thanks for the updated patch. It is heading in the right direction but maybe I wasn't clean enough in my previous comments. I do not believe this should be configurable via a command line parameter for startup.bat nor catalina.bat. This should simply be a system property that can be set in setenv.bat if required. Take a look at catalina.bat and how, for example, how LOGGING_MANAGER is used. -- 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: r894831 - /tomcat/trunk/dist.xml
Author: markt Date: Thu Dec 31 12:44:49 2009 New Revision: 894831 URL: http://svn.apache.org/viewvc?rev=894831&view=rev Log: Fix src build. - When is nested in a each include can only specify a single pattern - Reference existing in rather than defining a new one Modified: tomcat/trunk/dist.xml Modified: tomcat/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=894831&r1=894830&r2=894831&view=diff == --- tomcat/trunk/dist.xml (original) +++ tomcat/trunk/dist.xml Thu Dec 31 12:44:49 2009 @@ -79,19 +79,40 @@ - + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + @@ -600,7 +621,7 @@ - + @@ -615,7 +636,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r894832 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 31 12:46:19 2009 New Revision: 894832 URL: http://svn.apache.org/viewvc?rev=894832&view=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=894832&r1=894831&r2=894832&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 31 12:46:19 2009 @@ -140,3 +140,8 @@ (Modify spec versions to align with Tomcat 6) +1: markt -1: + +* Fix line-endings in src build + http://svn.apache.org/viewvc?rev=894831&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r894837 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 31 12:56:08 2009 New Revision: 894837 URL: http://svn.apache.org/viewvc?rev=894837&view=rev Log: Update proposal with better patch Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=894837&r1=894836&r2=894837&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 31 12:56:08 2009 @@ -146,9 +146,9 @@ -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 - Implment fail-safe EOL conversion for source disributions + Implement fail-safe EOL conversion for source distributions Based on a patch provided by sebb - http://svn.apache.org/viewvc?rev=883125&view=rev + http://people.apache.org/~markt/patches/2009-12-31-bug47609.patch +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.22
On 23/12/2009 17:56, jean-frederic clere wrote: > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.22/ > > According to the release process, the 6.0.22 tag is: > [X] Broken > [ ] Alpha > [ ] Beta > [ ] Stable > > 6.0.21 was too broken to be used. Take your time I won't release before > next week and before enough votes. Checked src.zip, src.tar.gz, zip, widows-x64.zip & exe MD5s good Signatures good, key in web of trust Neither the src.zip nor the src.tar.gz matches the tag. A number of binary files of various types (.exe, gif, bmp) look to have been modified. Further investigtation shows the fail-safe EOL patch wasn't quite right. I have fixed trunk and proposed the necessary fixes for 6.0.x and 5.5.x Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 --- Comment #4 from LiuYan 2009-12-31 05:23:57 UTC --- (In reply to comment #3) > Thanks for the updated patch. It is heading in the right direction but maybe I > wasn't clean enough in my previous comments. > I do not believe this should be configurable via a command line parameter for > startup.bat nor catalina.bat. This should simply be a system property that can > be set in setenv.bat if required. > Take a look at catalina.bat and how, for example, how LOGGING_MANAGER is used. Hi Mark: Pass title via command line parameter is just a convenient usage. If it's not prefered, then only apply the lastest patch for catalina.bat (if it's acceptable) can works as what you mean in comment #1. In the latest patch for catalina.bat, TITLE and STARTUP_TIME environment varaibles are readed and passed to _EXECJAVA. By the way: If %CD% contains "&" character, the startup.bat will failed at cd %CURRENT_DIR% %CURRENT_DIR% need to be quoted to avoid this error. "cd %CURRENT_DIR%" exists in startup.bat, shutdown.bat, catalina.bat, service.bat, version.bat, should I post a new bug? -- 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
DO NOT REPLY [Bug 48464] Feature request: startup.bat: -title option needed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 --- Comment #5 from Mark Thomas 2009-12-31 05:27:50 GMT --- (In reply to comment #4) > If it's not prefered, then only apply the lastest patch for catalina.bat (if > it's acceptable) can works as what you mean in comment #1. In the latest patch > for catalina.bat, TITLE and STARTUP_TIME environment varaibles are readed and > passed to _EXECJAVA. The new environment variables still need to be documented in the same way as the other environment variables. > By the way: > If %CD% contains "&" character, the startup.bat will failed at > cd %CURRENT_DIR% > > %CURRENT_DIR% need to be quoted to avoid this error. "cd %CURRENT_DIR%" exists > in startup.bat, shutdown.bat, catalina.bat, service.bat, version.bat, should I > post a new bug? Yes please. -- 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: r894841 - /tomcat/trunk/java/javax/el/CompositeELResolver.java
Author: markt
Date: Thu Dec 31 13:51:33 2009
New Revision: 894841
URL: http://svn.apache.org/viewvc?rev=894841&view=rev
Log:
A little more JSP 2.2 EL impl
Modified:
tomcat/trunk/java/javax/el/CompositeELResolver.java
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=894841&r1=894840&r2=894841&view=diff
==
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Thu Dec 31 13:51:33 2009
@@ -127,7 +127,16 @@
@Override
public Object invoke(ELContext context, Object base, Object method,
Class[] paramTypes, Object[] params) {
-// TODO
+context.setPropertyResolved(false);
+int sz = this.size;
+Object obj;
+for (int i = 0; i < sz; i++) {
+obj = this.resolvers[i].invoke(context, base, method, paramTypes,
+params);
+if (context.isPropertyResolved()) {
+return obj;
+}
+}
return null;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43819
--- Comment #14 from Christoph Beck 2009-12-31 07:00:33 UTC
---
Can you give some details regarding JSP 2.1 TCK failures?
I took a look at the code and I think the way you resolve el.properties in the
JRE lib directory is not correct since
System.getProperty("java.home") + "jre" + SEP + "lib" + SEP + "el.properties"
will resolve to .../jre/jre/lib/el.properties.
--
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
DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43819
--- Comment #15 from Mark Thomas 2009-12-31 07:11:55 GMT ---
(In reply to comment #14)
> Can you give some details regarding JSP 2.1 TCK failures?
Only vaguely since the TCK is protected by an NDA. The proposed checkType()
method failed when checking some numerical types. I think it was Double.TYPE
where the failure occurred.
> I took a look at the code and I think the way you resolve el.properties in the
> JRE lib directory is not correct since
>
> System.getProperty("java.home") + "jre" + SEP + "lib" + SEP + "el.properties"
>
> will resolve to .../jre/jre/lib/el.properties.
Thanks for the catch. I'll fix that in a sec.
--
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: r894863 - /tomcat/trunk/java/javax/el/ExpressionFactory.java
Author: markt
Date: Thu Dec 31 15:13:31 2009
New Revision: 894863
URL: http://svn.apache.org/viewvc?rev=894863&view=rev
Log:
Correct location.
Spotted by Christoph Beck
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=894863&r1=894862&r2=894863&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Thu Dec 31 15:13:31 2009
@@ -40,8 +40,7 @@
private static final String SEP = System.getProperty("file.separator");
private static final String PROPERTY_FILE =
-System.getProperty("java.home") + "jre" + SEP + "lib" + SEP +
-"el.properties";
+System.getProperty("java.home") + "lib" + SEP + "el.properties";
private static final String PROPERTY_NAME = "javax.el.ExpressionFactory";
public abstract Object coerceToType(Object obj, Class expectedType)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r894873 - /tomcat/trunk/java/javax/el/BeanELResolver.java
Author: markt
Date: Thu Dec 31 16:01:04 2009
New Revision: 894873
URL: http://svn.apache.org/viewvc?rev=894873&view=rev
Log:
A little more JSP 2.2 EL impl
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=894873&r1=894872&r2=894873&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Dec 31 16:01:04 2009
@@ -22,6 +22,7 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -354,8 +355,90 @@
@Override
public Object invoke(ELContext context, Object base, Object method,
Class[] paramTypes, Object[] params) {
-// TODO
-return null;
+if (context == null) {
+throw new NullPointerException();
+}
+ if (base == null || method == null) {
+ return null;
+ }
+
+ ExpressionFactory factory = ExpressionFactory.newInstance();
+
+ String methodName = (String) factory.coerceToType(method,
String.class);
+
+ // Find the matching method
+ Method matchingMethod = null;
+ Class clazz = base.getClass();
+ if (paramTypes != null) {
+ try {
+ matchingMethod = clazz.getMethod(methodName, paramTypes);
+ } catch (NoSuchMethodException e) {
+ throw new MethodNotFoundException(e);
+ }
+ } else {
+ int paramCount = 0;
+ if (params != null) {
+ paramCount = params.length;
+ }
+ Method[] methods = clazz.getMethods();
+ for (Method m : methods) {
+ if (m.getParameterTypes().length == paramCount) {
+ // Same number of parameters - use the first match
+ matchingMethod = m;
+ break;
+ }
+ if (m.isVarArgs()) {
+matchingMethod = m;
+ }
+ }
+ if (matchingMethod == null) {
+ throw new MethodNotFoundException(
+ "Unable to find method [" + methodName + "] with ["
+ + paramCount + "] parameters");
+ }
+ }
+
+ Class[] parameterTypes = matchingMethod.getParameterTypes();
+ Object[] parameters = null;
+ if (parameterTypes.length >0) {
+ parameters = new Object[parameterTypes.length];
+ if (matchingMethod.isVarArgs()) {
+ int varArgIndex = parameterTypes.length - 1;
+ int paramCount = params.length;
+ // First argCount-1 parameters are standard
+for (int i = 0; (i < varArgIndex - 1); i++) {
+parameters[i] = factory.coerceToType(params[i],
+parameterTypes[i]);
+}
+// Last parameter is the varags
+Class varArgClass =
+parameterTypes[varArgIndex].getComponentType();
+for (int i = (varArgIndex); i < paramCount; i++) {
+Object varargs = Array.newInstance(
+parameterTypes[paramCount],
+(paramCount - varArgIndex));
+Array.set(varargs, i,
+factory.coerceToType(params[i], varArgClass));
+parameters[varArgIndex] = varargs;
+}
+ } else {
+ parameters = new Object[parameterTypes.length];
+ for (int i = 0; i < parameterTypes.length; i++) {
+ parameters[i] = factory.coerceToType(params[i],
+ parameterTypes[i]);
+ }
+ }
+ }
+ try {
+return matchingMethod.invoke(base, parameters);
+} catch (IllegalArgumentException e) {
+throw new ELException(e);
+} catch (IllegalAccessException e) {
+throw new ELException(e);
+} catch (InvocationTargetException e) {
+throw new ELException(e.getCause());
+}
+
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43819 --- Comment #16 from Christoph Beck 2009-12-31 08:07:53 UTC --- OK, seems like the checkType() method is no longer needed anyway. I think package org.apache.jasper.compiler needs some changes too, though this might not be in the scope of this bug. The ELParser class seems to parse expressions using its own internal parsing mechanism and doesn't support syntax for method invocations which is part of EE6. To eliminate redundancy, the code should probably be refactored to use an expression factory instead. -- 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
DO NOT REPLY [Bug 43819] Support latest JSR245 proposal to make EL "self-contained"
https://issues.apache.org/bugzilla/show_bug.cgi?id=43819 --- Comment #17 from Mark Thomas 2009-12-31 09:55:14 GMT --- (In reply to comment #16) > I think package org.apache.jasper.compiler needs some changes too, though this > might not be in the scope of this bug. Correct. This discussion should be continued on the dev list. > The ELParser class seems to parse > expressions using its own internal parsing mechanism As far as I recall (and it is a while since I looked at the EL code) that parser just parses something - eg an attribute value - into bits that are an expression and bits that are not. It doesn't parse the actual expressions. > and doesn't support syntax for method invocations which is part of EE6. Nothing does yet. That is still on the Tomcat 7 todo list. Oddly enough I am working on it at the moment. First step will be to update the jtt file. > To eliminate redundancy, the code should probably be refactored to use an > expression factory instead. I'm not sure that refactoring is needed. Mark -- 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
