Author: remy.maucherat(a)jboss.com Date: 2008-09-25 10:54:16 -0400 (Thu, 25 Sep 2008) New Revision: 792 Modified: trunk/java/org/apache/el/lang/ELSupport.java trunk/java/org/apache/jasper/Constants.java trunk/res/jboss-web.nsi trunk/webapps/docs/changelog.xml Log: - Cleanup. - Add a missing sys property. Modified: trunk/java/org/apache/el/lang/ELSupport.java =================================================================== --- trunk/java/org/apache/el/lang/ELSupport.java 2008-09-24 14:40:04 UTC (rev 791) +++ trunk/java/org/apache/el/lang/ELSupport.java 2008-09-25 14:54:16 UTC (rev 792) @@ -36,8 +36,6 @@ */ public class ELSupport { - private final static ELSupport REF = new ELSupport(); - private final static Long ZERO = new Long(0L); public final static void throwUnhandled(Object base, Object property) @@ -433,9 +431,8 @@ public final static boolean isStringFloat(final String str) { int len = str.length(); if (len > 1) { - char c = 0; for (int i = 0; i < len; i++) { - switch (c = str.charAt(i)) { + switch (str.charAt(i)) { case 'E': return true; case 'e': Modified: trunk/java/org/apache/jasper/Constants.java =================================================================== --- trunk/java/org/apache/jasper/Constants.java 2008-09-24 14:40:04 UTC (rev 791) +++ trunk/java/org/apache/jasper/Constants.java 2008-09-25 14:54:16 UTC (rev 792) @@ -196,6 +196,6 @@ * The name of the path parameter used to pass the session identifier * back and forth with the client. */ - public static final String SESSION_PARAMETER_NAME = "jsessionid"; + public static final String SESSION_PARAMETER_NAME = System.getProperty("org.apache.catalina.jsessionid", "jsessionid"); } Modified: trunk/res/jboss-web.nsi =================================================================== --- trunk/res/jboss-web.nsi 2008-09-24 14:40:04 UTC (rev 791) +++ trunk/res/jboss-web.nsi 2008-09-25 14:54:16 UTC (rev 792) @@ -115,6 +115,7 @@ SetOutPath $INSTDIR File jboss-web.ico File LICENSE + File NOTICE SetOutPath $INSTDIR\lib File /r lib\*.* SetOutPath $INSTDIR\logs @@ -598,6 +599,7 @@ RMDir /r "$SMPROGRAMS\JBoss Web 2.1" Delete "$INSTDIR\jboss-web.ico" Delete "$INSTDIR\LICENSE" + Delete "$INSTDIR\NOTICE" RMDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\lib" Delete "$INSTDIR\conf\*.dtd" Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-09-24 14:40:04 UTC (rev 791) +++ trunk/webapps/docs/changelog.xml 2008-09-25 14:54:16 UTC (rev 792) @@ -62,6 +62,9 @@ should all now be fixed. The two pass parsing means we can do away with the previous 'replace with unused unicode character' trick. (markt) </fix> + <fix> + Remove unused code in ELSupport. (markt) + </fix> </changelog> </subsection> <subsection name="Others">