JBossWeb SVN: r808 - branches.
by jbossweb-commits＠lists.jboss.org
Author: jhowell(a)redhat.com
Date: 2008-10-10 11:00:13 -0400 (Fri, 10 Oct 2008)
New Revision: 808
Added:
branches/JBOSSWEB_2_0_0_GA_CP05_JBPAPP-869/
Log:
[JBPAPP-951] - Add Branch for one-off
Copied: branches/JBOSSWEB_2_0_0_GA_CP05_JBPAPP-869 (from rev 807, tags/JBOSSWEB_2_0_0_GA_CP05)
16 years, 2 months
JBossWeb SVN: r806 - trunk/webapps/docs.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-09 07:12:57 -0400 (Thu, 09 Oct 2008)
New Revision: 806
Modified:
trunk/webapps/docs/jasper-howto.xml
Log:
- Jasper docs are outdated.
Modified: trunk/webapps/docs/jasper-howto.xml
===================================================================
--- trunk/webapps/docs/jasper-howto.xml 2008-10-08 10:29:14 UTC (rev 805)
+++ trunk/webapps/docs/jasper-howto.xml 2008-10-09 11:12:57 UTC (rev 806)
@@ -1,4 +1,20 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!DOCTYPE document [
<!ENTITY project SYSTEM "project.xml">
]>
@@ -69,16 +85,11 @@
in your global <code>$CATALINA_BASE/conf/web.xml</code>.
<ul>
-<li><strong>checkInterval</strong> - If development is false and reloading is
-true, background compiles are enabled. checkInterval is the time in seconds
-between checks to see if a JSP page needs to be recompiled. Default
-<code>300</code> seconds.</li>
+<li><strong>checkInterval</strong> - If development is false and checkInterval
+is greater than zero, background compiles are enabled. checkInterval is the time
+in seconds between checks to see if a JSP page (and its dependent files) needs
+to be recompiled. Default <code>0</code> seconds.</li>
-<li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
-pages. See the Ant documentation for more information. If the value is not set,
-then the default Eclipse JDT Java compiler will be used instead of using Ant.
-No default value.</li>
-
<li><strong>classdebuginfo</strong> - Should the class file be compiled with
debugging information? <code>true</code> or <code>false</code>, default
<code>true</code>.
@@ -90,14 +101,30 @@
attribute is always set when Jasper is used within JBoss Web. By default the
classpath is created dynamically based on the current web application.</li>
-<li><strong>compilerSourceVM</strong> - What JDK version are the source files compatible with? (Default JDK 1.4)</li>
+<li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
+pages. See the Ant documentation for more information. If the value is not set,
+then the default Eclipse JDT Java compiler will be used instead of using Ant.
+No default value.</li>
-<li><strong>compilerTargetVM</strong> - What JDK version are the generated files compatible with? (Default JDK 1.4)</li>
+<li><strong>compilerSourceVM</strong> - What JDK version are the source files
+compatible with? (Default JDK 1.4)</li>
-<li><strong>development</strong> - Is Jasper used in development mode (will
-check for JSP modification on every access)? <code>true</code> or
-<code>false</code>, default <code>true</code>.</li>
+<li><strong>compilerTargetVM</strong> - What JDK version are the generated files
+compatible with? (Default JDK 1.4)</li>
+<li><strong>development</strong> - Is Jasper used in development mode? If true,
+the frequency at which JSPs are checked for modification may be specified via
+the modificationTestInterval parameter.<code>true</code> or <code>false</code>,
+default <code>true</code>.</li>
+
+<li><strong>displaySourceFragment</strong> - Should a source fragment be
+included in exception messages? <code>true</code> or <code>false</code>,
+default <code>true</code>.</li>
+
+<li><strong>dumpSmap</strong> - Should the SMAP info for JSR45 debugging be
+dumped to a file? <code>true</code> or <code>false</code>, default
+<code>false</code>. <code>false</code> if suppressSmap is true.</li>
+
<li><strong>enablePooling</strong> - Determines whether tag handler pooling is
enabled. <code>true</code> or <code>false</code>, default <code>true</code>.
</li>
@@ -107,20 +134,25 @@
will be used.
</li>
+<li><strong>errorOnUseBeanInvalidClassAttribute</strong> - Should Jasper issue
+an error when the value of the class attribute in an useBean action is not a
+valid bean class? <code>true</code> or <code>false</code>, default
+<code>true</code>.</li>
+
+<li><strong>fork</strong> - Have Ant fork JSP page compiles so they are
+performed in a seperate JVM from Tomcat? <code>true</code> or
+<code>false</code>, default <code>true</code>.</li>
+
+<li><strong>genStringAsCharArray</strong> - Should text strings be generated as char
+arrays, to improve performance in some cases? Default <code>false</code>.</li>
+
<li><strong>ieClassId</strong> - The class-id value to be sent to Internet
Explorer when using <jsp:plugin> tags. Default
<code>clsid:8AD9C840-044E-11D1-B3E9-00805F499D93</code>.</li>
-<li><strong>fork</strong> - Have Ant fork JSP page compiles so they are
-performed in a seperate JVM from JBoss Web ? <code>true</code> or
-<code>false</code>, default <code>true</code>.</li>
-
<li><strong>javaEncoding</strong> - Java file encoding to use for generating
java source files. Default <code>UTF8</code>.</li>
-<li><strong>genStringAsCharArray</strong> - Should text strings be generated as char
-arrays, to improve performance in some cases? Default <code>false</code>.</li>
-
<li><strong>keepgenerated</strong> - Should we keep the generated Java source
code for each page instead of deleting it? <code>true</code> or
<code>false</code>, default <code>true</code>.</li>
@@ -129,42 +161,49 @@
print statement per input line, to ease debugging?
<code>true</code> or <code>false</code>, default <code>true</code>.</li>
-<li><strong>modificationTestInterval</strong> - Checks for modification for a given
-JSP file (and all its dependent files) will be performed only once every specified amount
-of seconds. Setting this to 0 will cause the JSP to be checked on every access.
-Default is <code>4</code> seconds.</li>
+<li><strong>modificationTestInterval</strong> - Causes a JSP (and its dependent
+files) to not be checked for modification during the specified time interval
+(in seconds) from the last time the JSP was checked for modification. A value of
+0 will cause the JSP to be checked on every access. Used in development mode
+only. Default is <code>4</code> seconds.</li>
-<li><strong>reloading</strong> - Should Jasper check for modified JSPs?
-<code>true</code> or <code>false</code>, default <code>false</code>.</li>
-
<li><strong>scratchdir</strong> - What scratch directory should we use when
compiling JSP pages? Default is the work directory for the current web
application.</li>
+<li><strong>suppressSmap</strong> - Should the generation of SMAP info for JSR45
+debugging be suppressed? <code>true</code> or <code>false</code>, default
+<code>false</code>.</li>
+
<li><strong>trimSpaces</strong> - Should white spaces in template text between
actions or directives be trimmed ?, default <code>false</code>.</li>
+
+<li><strong>xpoweredBy</strong> - Determines whether X-Powered-By response
+header is added by generated servlet. <code>true</code> or <code>false</code>,
+default <code>false</code>.</li>
</ul>
</p>
-<p>The Java compiler from Eclipse JDT in included as the default compiler. It is an
-advanced Java compiler which will load all dependencies from the Jboss Web class loader,
-which will help tremendously when compiling on large installations with tens of JARs.
-On fast servers, this will allow sub-second recompilation cycles for even large JSP
-pages.</p>
+<p>The Java compiler from Eclipse JDT in included as the default compiler. It is
+an advanced Java compiler which will load all dependencies from the Tomcat class
+loader, which will help tremendously when compiling on large installations with
+tens of JARs. On fast servers, this will allow sub-second recompilation cycles
+for even large JSP pages.</p>
-<p>Apache Ant can be used instead instead of
-the new compiler by simply removing the <code>lib/jasper-jdt.jar</code> file,
-and placing the <code>ant.jar</code> file from the latest Ant distribution in the
-<code>lib</code> folder. If you do this, you also need to use the "javac"
+<p>Apache Ant, which was used in previous Tomcat releases, can be used instead
+of the new compiler by simply removing the <code>lib/jasper-jdt.jar</code> file,
+and placing the <code>ant.jar</code> file from the latest Ant distribution in
+the <code>lib</code> folder. If you do this, you also need to use the "javac"
argument to catalina.sh.</p>
</section>
<section name="Production Configuration">
-<p>The main JSP optimization which can be done is precompilation of JSPs. However,
-this might not be possible (for example, when using the jsp-property-group feature)
-or practical, in which case the configuration of the Jasper servlet becomes critical.</p>
+<p>The main JSP optimization which can be done is precompilation of JSPs.
+However, this might not be possible (for example, when using the
+jsp-property-group feature) or practical, in which case the configuration of the
+Jasper servlet becomes critical.</p>
<p>When using Jasper 2 in a production JBoss Web server you should consider
making the following changes from the default configuration.
@@ -215,7 +254,7 @@
optimize="off"
debug="on" failonerror="false"
srcdir="${webapp.path}/WEB-INF/src"
- excludes="**/*.smap">
+ excludes="**/*.smap">
<classpath>
<pathelement location="${webapp.path}/WEB-INF/classes"/>
<fileset dir="${webapp.path}/WEB-INF/lib">
@@ -239,10 +278,10 @@
</target>
<target name="cleanup">
- <delete>
+ <delete>
<fileset dir="${webapp.path}/WEB-INF/src"/>
<fileset dir="${webapp.path}/WEB-INF/classes/org/apache/jsp"/>
- </delete>
+ </delete>
</target>
</project>
@@ -273,28 +312,34 @@
<p>
At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
-with the current web application deployment descriptor at <code>${webapp.path}/WEB-INF/web.xml</code>.
-When you want to use Java 5 feature inside your jsp's, add the following javac compiler task
-attributes: <code>source="1.5" target="1.5"</code>. For live application
-you can also compile with <code>optimize="on"</code> and without debug info
-<code>debug="off"</code>.
+with the current web application deployment descriptor at
+<code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 5
+features inside your jsp's, add the following javac compiler task attributes:
+<code>source="1.5" target="1.5"</code>. For live
+applications you can also compile with <code>optimize="on"</code> and
+without debug info <code>debug="off"</code>.
</p>
<p>
When you don't want to stop the jsp generation at first jsp syntax error, use
-<code>failOnError="false"</code>and with <code>showSuccess="true"</code>
-all successfull <i>jsp to java</i> generation are printed out. Sometimes it is
-very helpfull, when you cleanup the generate java source files at <code>${webapp.path}/WEB-INF/src</code>
-and the compile jsp servlet classes at <code>${webapp.path}/WEB-INF/classes/org/apache/jsp</code>.
+<code>failOnError="false"</code>and with
+<code>showSuccess="true"</code> all successfull <i>jsp to java</i>
+generation are printed out. Sometimes it is very helpfull, when you cleanup the
+generate java source files at <code>${webapp.path}/WEB-INF/src</code>
+and the compile jsp servlet classes at
+<code>${webapp.path}/WEB-INF/classes/org/apache/jsp</code>.
</p>
<p><strong>Hints:</strong>
<ul>
-<li> When you switch to another JBoss Web or Tomcat release, then regenerate and recompile
-your jsp's with this version again!</li>
-<li>Use java system property at server runtime to disable tag pooling <code>org.apache.jasper.runtime.JspFactoryImpl.USE_POOL=false</code>.
-and limit the buffering with <code>org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true</code>. Note that changing
-from the defaults may affect performance, but depending on the application.</li>
+<li> When you switch to another JBoss Web release, then regenerate and recompile
+your jsp's with the new JBoss Web version.</li>
+<li>Use java system property at server runtime to disable tag pooling
+<code>org.apache.jasper.runtime.JspFactoryImpl.USE_POOL=false</code>.
+and limit the buffering with
+<code>org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true</code>. Note
+that changing from the defaults may affect performance, but it will vary
+depending on the application.</li>
</ul>
</p>
</section>
@@ -307,13 +352,13 @@
<ul>
<li>From your <a href="ant.apache.org">Ant</a> installation, copy ant.jar
and (if it's available: Ant 1.5 and later) ant-launcher.jar to
-<code>$CATALINA_BASE/lib</code>.</li>
+<code>$CATALINA_HOME/lib</code>.</li>
<li>Download and install jikes. jikes must support the -encoding option.
Execute <code>jikes -help</code> to verify that it was built with support
for <code>-encoding</code>.</li>
<li>Set the init parameter <code>compiler</code> to <code>jikes</code>.</li>
<li>Define the property <code>-Dbuild.compiler.emacs=true</code> when starting
-JBoss Web by adding it to your <code>CATALINA_OPTS</code> environment variable.
+Tomcat by adding it to your <code>CATALINA_OPTS</code> environment variable.
This changes how jikes outputs error messages so that it is compatible with
Jasper.</li>
<li>If you get an error reporting that jikes can't use UTF8 encoding, try
16 years, 2 months
JBossWeb SVN: r805 - in trunk: java/org/apache/el/lang and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-08 06:29:14 -0400 (Wed, 08 Oct 2008)
New Revision: 805
Modified:
trunk/java/org/apache/coyote/http11/Http11Processor.java
trunk/java/org/apache/el/lang/ELSupport.java
trunk/java/org/apache/jasper/compiler/Parser.java
trunk/webapps/docs/changelog.xml
Log:
- Supposed HTTP fix.
- Sync with Jasper's EL changes.
Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-10-07 12:32:35 UTC (rev 804)
+++ trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-10-08 10:29:14 UTC (rev 805)
@@ -896,7 +896,8 @@
inputBuffer.recycle();
outputBuffer.recycle();
- // Recycle ssl info
+ // Recycle socket
+ this.socket = null;
sslSupport = null;
}
Modified: trunk/java/org/apache/el/lang/ELSupport.java
===================================================================
--- trunk/java/org/apache/el/lang/ELSupport.java 2008-10-07 12:32:35 UTC (rev 804)
+++ trunk/java/org/apache/el/lang/ELSupport.java 2008-10-08 10:29:14 UTC (rev 805)
@@ -235,7 +235,7 @@
if (number instanceof BigInteger) {
return new BigDecimal((BigInteger) number);
}
- return new BigDecimal(number.toString());
+ return new BigDecimal(number.doubleValue());
}
if (Byte.TYPE == type || Byte.class.equals(type)) {
return new Byte(number.byteValue());
Modified: trunk/java/org/apache/jasper/compiler/Parser.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Parser.java 2008-10-07 12:32:35 UTC (rev 804)
+++ trunk/java/org/apache/jasper/compiler/Parser.java 2008-10-08 10:29:14 UTC (rev 805)
@@ -261,21 +261,20 @@
* Char
*/
private String parseQuoted(Mark start, String tx, char quote)
- throws JasperException {
+ throws JasperException {
StringBuffer buf = new StringBuffer();
- boolean possibleEL = tx.contains("${");
int size = tx.length();
int i = 0;
while (i < size) {
char ch = tx.charAt(i);
if (ch == '&') {
if (i + 5 < size && tx.charAt(i + 1) == 'a'
- && tx.charAt(i + 2) == 'p' && tx.charAt(i + 3) == 'o'
+ && tx.charAt(i + 2) == 'p' && tx.charAt(i + 3) == 'o'
&& tx.charAt(i + 4) == 's' && tx.charAt(i + 5) == ';') {
buf.append('\'');
i += 6;
} else if (i + 5 < size && tx.charAt(i + 1) == 'q'
- && tx.charAt(i + 2) == 'u' && tx.charAt(i + 3) == 'o'
+ && tx.charAt(i + 2) == 'u' && tx.charAt(i + 3) == 'o'
&& tx.charAt(i + 4) == 't' && tx.charAt(i + 5) == ';') {
buf.append('"');
i += 6;
@@ -285,21 +284,10 @@
}
} else if (ch == '\\' && i + 1 < size) {
ch = tx.charAt(i + 1);
- if (ch == '\\' || ch == '\"' || ch == '\'') {
- if (pageInfo.isELIgnored() || !possibleEL) {
- // EL is not enabled or no chance of EL
- // Unescape these now
- buf.append(ch);
- i += 2;
- } else {
- // EL is enabled and ${ appears in value
- // EL processing will escape these
- //FIXME: remm: I don't see how to do without unescaping right now
- //buf.append('\\');
- buf.append(ch);
- i += 2;
- }
- } else if (ch == '>') {
+ if (ch == '\\' || ch == '\"' || ch == '\'' || ch == '>') {
+ // \ " and ' are always unescaped regardless of if they are
+ // inside or outside of an EL expression. JSP.1.6 takes
+ // precedence over JSP.1.3.10 (confirmed with EG).
buf.append(ch);
i += 2;
} else {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-10-07 12:32:35 UTC (rev 804)
+++ trunk/webapps/docs/changelog.xml 2008-10-08 10:29:14 UTC (rev 805)
@@ -79,6 +79,9 @@
<add>
Add AJP support for certificate chains. (billbarker)
</add>
+ <fix>
+ Null out socket in java.io HTTP connector. (fhanik)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
16 years, 3 months
JBossWeb SVN: r804 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-07 08:32:35 -0400 (Tue, 07 Oct 2008)
New Revision: 804
Modified:
trunk/java/org/apache/catalina/startup/ContextConfig.java
trunk/webapps/docs/changelog.xml
Log:
- Minor deployer fix.
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2008-10-06 16:14:12 UTC (rev 803)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2008-10-07 12:32:35 UTC (rev 804)
@@ -854,9 +854,9 @@
docBase = "ROOT";
} else {
if (path.startsWith("/")) {
- docBase = path.substring(1);
+ docBase = path.substring(1).replace('/', '#');
} else {
- docBase = path;
+ docBase = path.replace('/', '#');
}
}
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-10-06 16:14:12 UTC (rev 803)
+++ trunk/webapps/docs/changelog.xml 2008-10-07 12:32:35 UTC (rev 804)
@@ -52,6 +52,9 @@
<fix>
CGI servlet generics cleanup. (markt)
</fix>
+ <fix>
+ Better nested context handling. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
16 years, 3 months
JBossWeb SVN: r803 - tags.
by jbossweb-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-10-06 12:14:12 -0400 (Mon, 06 Oct 2008)
New Revision: 803
Added:
tags/JBOSSWEB_2_0_0_GA_CP08/
Log:
new tag to add JBWEB-117 - JBWEB-118
Copied: tags/JBOSSWEB_2_0_0_GA_CP08 (from rev 802, branches/JBOSSWEB_2_0_0_GA_CP)
16 years, 3 months
JBossWeb SVN: r802 - in trunk: java/org/apache/el/lang and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-06 10:57:47 -0400 (Mon, 06 Oct 2008)
New Revision: 802
Modified:
trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
trunk/java/org/apache/coyote/ajp/AjpProcessor.java
trunk/java/org/apache/el/lang/ELSupport.java
trunk/webapps/docs/changelog.xml
Log:
- Nth ELSupport update ...
- Add cert chains support in AJP.
Modified: trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2008-10-04 18:12:46 UTC (rev 801)
+++ trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2008-10-06 14:57:47 UTC (rev 802)
@@ -542,19 +542,28 @@
new ByteArrayInputStream(certData.getBytes(),
certData.getStart(),
certData.getLength());
- // Fill the first element.
+ // Fill the elements.
try {
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
- X509Certificate cert = (X509Certificate)
- cf.generateCertificate(bais);
- jsseCerts = new X509Certificate[1];
- jsseCerts[0] = cert;
- request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts);
+ while(bais.available() > 0) {
+ X509Certificate cert = (X509Certificate)
+ cf.generateCertificate(bais);
+ if(jsseCerts == null) {
+ jsseCerts = new X509Certificate[1];
+ jsseCerts[0] = cert;
+ } else {
+ X509Certificate [] temp = new X509Certificate[jsseCerts.length+1];
+ System.arraycopy(jsseCerts,0,temp,0,jsseCerts.length);
+ temp[jsseCerts.length] = cert;
+ jsseCerts = temp;
+ }
+ }
} catch (java.security.cert.CertificateException e) {
log.error(sm.getString("ajpprocessor.certs.fail"), e);
return;
}
+ request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts);
}
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {
Modified: trunk/java/org/apache/coyote/ajp/AjpProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2008-10-04 18:12:46 UTC (rev 801)
+++ trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2008-10-06 14:57:47 UTC (rev 802)
@@ -547,19 +547,28 @@
new ByteArrayInputStream(certData.getBytes(),
certData.getStart(),
certData.getLength());
- // Fill the first element.
+ // Fill the elements.
try {
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
- X509Certificate cert = (X509Certificate)
- cf.generateCertificate(bais);
- jsseCerts = new X509Certificate[1];
- jsseCerts[0] = cert;
- request.setAttribute(JIoEndpoint.CERTIFICATE_KEY, jsseCerts);
+ while(bais.available() > 0) {
+ X509Certificate cert = (X509Certificate)
+ cf.generateCertificate(bais);
+ if(jsseCerts == null) {
+ jsseCerts = new X509Certificate[1];
+ jsseCerts[0] = cert;
+ } else {
+ X509Certificate [] temp = new X509Certificate[jsseCerts.length+1];
+ System.arraycopy(jsseCerts,0,temp,0,jsseCerts.length);
+ temp[jsseCerts.length] = cert;
+ jsseCerts = temp;
+ }
+ }
} catch (java.security.cert.CertificateException e) {
log.error(sm.getString("ajpprocessor.certs.fail"), e);
return;
}
+ request.setAttribute(JIoEndpoint.CERTIFICATE_KEY, jsseCerts);
}
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {
Modified: trunk/java/org/apache/el/lang/ELSupport.java
===================================================================
--- trunk/java/org/apache/el/lang/ELSupport.java 2008-10-04 18:12:46 UTC (rev 801)
+++ trunk/java/org/apache/el/lang/ELSupport.java 2008-10-06 14:57:47 UTC (rev 802)
@@ -137,7 +137,7 @@
return obj0.equals(obj1);
}
}
-
+
/**
* @param obj
* @param type
@@ -224,18 +224,18 @@
return ((BigDecimal) number).toBigInteger();
}
if (number instanceof BigInteger) {
- return new BigInteger(number.toString());
+ return number;
}
return BigInteger.valueOf(number.longValue());
}
if (BigDecimal.class.equals(type)) {
if (number instanceof BigDecimal) {
- return new BigDecimal(number.toString());
+ return number;
}
if (number instanceof BigInteger) {
return new BigDecimal((BigInteger) number);
}
- return new BigDecimal(number.doubleValue());
+ return new BigDecimal(number.toString());
}
if (Byte.TYPE == type || Byte.class.equals(type)) {
return new Byte(number.byteValue());
@@ -341,7 +341,7 @@
public final static Object coerceToType(final Object obj, final Class type)
throws IllegalArgumentException {
if (type == null || Object.class.equals(type) ||
- (obj != null && type.equals(obj.getClass()))) {
+ (obj != null && type.isAssignableFrom(obj.getClass()))) {
return obj;
}
if (String.class.equals(type)) {
@@ -356,9 +356,6 @@
if (Boolean.class.equals(type) || Boolean.TYPE == type) {
return coerceToBoolean(obj);
}
- if (obj != null && type.isAssignableFrom(obj.getClass())) {
- return obj;
- }
if (type.isEnum()) {
return coerceToEnum(obj, type);
}
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-10-04 18:12:46 UTC (rev 801)
+++ trunk/webapps/docs/changelog.xml 2008-10-06 14:57:47 UTC (rev 802)
@@ -73,6 +73,9 @@
<fix>
Remote date tool class, since it has sync issues. (markt, remm)
</fix>
+ <add>
+ Add AJP support for certificate chains. (billbarker)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -97,6 +100,9 @@
<fix>
Ascii parsing bug. (markt)
</fix>
+ <fix>
+ Fix regression in Big* types handling. Patch provided by Nils Eckert. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Others">
16 years, 3 months
JBossWeb SVN: r801 - trunk/java/org/apache/jasper/compiler.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-04 14:12:46 -0400 (Sat, 04 Oct 2008)
New Revision: 801
Modified:
trunk/java/org/apache/jasper/compiler/Parser.java
Log:
- Add back the unescaping (don't see how it would work without it).
Modified: trunk/java/org/apache/jasper/compiler/Parser.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Parser.java 2008-10-03 14:22:59 UTC (rev 800)
+++ trunk/java/org/apache/jasper/compiler/Parser.java 2008-10-04 18:12:46 UTC (rev 801)
@@ -294,7 +294,8 @@
} else {
// EL is enabled and ${ appears in value
// EL processing will escape these
- buf.append('\\');
+ //FIXME: remm: I don't see how to do without unescaping right now
+ //buf.append('\\');
buf.append(ch);
i += 2;
}
16 years, 3 months
JBossWeb SVN: r800 - trunk.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-10-03 10:22:59 -0400 (Fri, 03 Oct 2008)
New Revision: 800
Added:
trunk/PATCHES.txt
Log:
- Add a list of patches not planned for merging at this time.
Added: trunk/PATCHES.txt
===================================================================
--- trunk/PATCHES.txt (rev 0)
+++ trunk/PATCHES.txt 2008-10-03 14:22:59 UTC (rev 800)
@@ -0,0 +1,7 @@
+Patched dropped
+
+http://svn.apache.org/viewvc?rev=701358&view=rev
+Some symlink fix (too many checks needed)
+
+http://svn.apache.org/viewvc?rev=701355&view=rev
+XML parser in webapp fix (significant refactoring, partial)
16 years, 3 months