You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Shawn Jiang <ge...@gmail.com> on 2012/08/09 06:24:30 UTC
Fwd: svn commit: r1371029 - /geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
We'd better to create a JIRA for code changes if possible. And then the
history viewer can know the background of this change in the JIRA.
---------- Forwarded message ----------
From: <vi...@apache.org>
Date: Thu, Aug 9, 2012 at 11:08 AM
Subject: svn commit: r1371029 -
/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
To: scm@geronimo.apache.org
Author: violalu
Date: Thu Aug 9 03:08:24 2012
New Revision: 1371029
URL: http://svn.apache.org/viewvc?rev=1371029&view=rev
Log:
hanlde file url when compile jsp
Modified:
geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Modified:
geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1371029&r1=1371028&r2=1371029&view=diff
==============================================================================
---
geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
(original)
+++
geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Thu Aug 9 03:08:24 2012
@@ -505,7 +505,7 @@ public abstract class Compiler {
try {
String key = include.getKey();
URL includeUrl;
- if (key.startsWith("jar:")) {
+ if (key.startsWith("jar:") ||key.startsWith("file:")) {
includeUrl = new URL(key);
} else {
includeUrl = ctxt.getResource(include.getKey());
--
Shawn
Re: svn commit: r1371029 - /geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
Posted by viola lu <vi...@gmail.com>.
We can track it in jira https://issues.apache.org/jira/browse/GERONIMO-6370
On Thu, Aug 9, 2012 at 12:24 PM, Shawn Jiang <ge...@gmail.com> wrote:
> We'd better to create a JIRA for code changes if possible. And then the
> history viewer can know the background of this change in the JIRA.
>
>
> ---------- Forwarded message ----------
> From: <vi...@apache.org>
> Date: Thu, Aug 9, 2012 at 11:08 AM
> Subject: svn commit: r1371029 -
> /geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
> To: scm@geronimo.apache.org
>
>
> Author: violalu
> Date: Thu Aug 9 03:08:24 2012
> New Revision: 1371029
>
> URL: http://svn.apache.org/viewvc?rev=1371029&view=rev
> Log:
> hanlde file url when compile jsp
>
> Modified:
>
> geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
>
> Modified:
> geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
> URL:
> http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java?rev=1371029&r1=1371028&r2=1371029&view=diff
>
> ==============================================================================
> ---
> geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
> (original)
> +++
> geronimo/external/trunk/tomcat-parent-7.0.27/jasper/src/main/java/org/apache/jasper/compiler/Compiler.java
> Thu Aug 9 03:08:24 2012
> @@ -505,7 +505,7 @@ public abstract class Compiler {
> try {
> String key = include.getKey();
> URL includeUrl;
> - if (key.startsWith("jar:")) {
> + if (key.startsWith("jar:") ||key.startsWith("file:")) {
> includeUrl = new URL(key);
> } else {
> includeUrl = ctxt.getResource(include.getKey());
>
>
>
>
>
> --
> Shawn
>
--
viola
Apache Geronimo