← Back to branch summary

~james-page/ubuntu/natty/tomcat6/fix-662588

« back to all changes in this revision

Viewing changes to java/org/apache/jasper/Constants.java

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Iulian Udrea
  • Date: 2009-06-09 12:35:19 UTC
  • mfrom: (1.2.1 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090609123519-7owjbso5ttnka6ur
Tags: 6.0.20-1ubuntu1
https://launchpad.net/bugs/385262
[ Iulian Udrea ]
* Merge from debian unstable (LP: #385262), remaining changes:
  - debian/control, debian/rules: Use default-jdk to build
  - debian/control: Run using default-jre-headless by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/jasper/Constants.java
183
183
    /**
184
184
     * A replacement char for "\$".
185
185
     * XXX This is a hack to avoid changing EL interpreter to recognize "\$"
 
186
     * @deprecated
186
187
     */
187
188
    public static final char ESC = '\u001b';
 
189
    /**
 
190
     * @deprecated
 
191
     */
188
192
    public static final String ESCStr = "'\\u001b'";
189
193
 
190
194
    /**
197
201
     * The name of the path parameter used to pass the session identifier
198
202
     * back and forth with the client.
199
203
     */
200
 
    public static final String SESSION_PARAMETER_NAME = "jsessionid";
 
204
    public static final String SESSION_PARAMETER_NAME =
 
205
        System.getProperty("org.apache.catalina.SESSION_PARAMETER_NAME",
 
206
                "jsessionid");
201
207
 
202
208
}