You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/01/21 20:44:42 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
costin 2003/01/21 11:44:42
Modified: jasper2/src/share/org/apache/jasper JspC.java
Log:
Support for packages in precompiled servlets - otherwise all go to the
same package and we get conflicts.
Revision Changes Path
1.21 +8 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JspC.java 31 Dec 2002 14:01:17 -0000 1.20
+++ JspC.java 21 Jan 2003 19:44:42 -0000 1.21
@@ -547,7 +547,10 @@
targetClassName = null;
}
if (targetPackage != null) {
- clctxt.setServletPackageName(targetPackage);
+ int baseLen=jspUri.lastIndexOf("/");
+ if( baseLen <0 ) baseLen=0;
+ String packageSubs= jspUri.substring(0, baseLen).replace( '/', '.' );
+ clctxt.setServletPackageName( targetPackage + "." + packageSubs);
}
setupContext(clctxt);
@@ -593,7 +596,7 @@
} else if (dieLevel != NO_DIE_LEVEL) {
dieOnExit = true;
}
- throw new JasperException( e );
+ throw new JasperException( "Error compiling " + file, e );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper
JspC.java
Posted by Hans Bergsten <ha...@gefionsoftware.com>.
Costin Manolache wrote:
> Sorry, I didn't see the patch - I was precompiling the admin and
> hit the problem.
>
> BTW - why don't you fix it yourself - you are committer AFAIK :-) ?
There's a simple reason: it's been so long since I was actively involved
in the development that I (a) want to lurk a bit before I start
making commits, and (b) I've lost my password/key/procedures and
haven't had the time to figure it all out again ;-)
I _will_ start committing again, but I hope you can have some patience
and apply a few patches I submit in the bug database database until
then.
Hans
> Hans Bergsten wrote:
>
>
>>costin@apache.org wrote:
>>
>>>costin 2003/01/21 11:44:42
>>>
>>> Modified: jasper2/src/share/org/apache/jasper JspC.java
>>> Log:
>>> Support for packages in precompiled servlets - otherwise all go to the
>>> same package and we get conflicts.
>>
>>Thanks for finally fixing this, but please use the patch I submitted for
>>BugID 14302 instead, since it handles special characters in the path
>>as well. The TagLibraryInfoImpl patch (same BugID) is also required to
>>support TLDs located in JAR files.
>>
>>Hans
>>
>>
>>> Revision Changes Path
>>> 1.21 +8 -5
>>> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
>>>
>>> Index: JspC.java
>>> ===================================================================
>>> RCS file:
>>>
>>
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
>
>>> retrieving revision 1.20 retrieving revision 1.21
>>> diff -u -r1.20 -r1.21
>>> --- JspC.java 31 Dec 2002 14:01:17 -0000 1.20
>>> +++ JspC.java 21 Jan 2003 19:44:42 -0000 1.21
>>> @@ -547,7 +547,10 @@
>>> targetClassName = null;
>>> }
>>> if (targetPackage != null) {
>>> - clctxt.setServletPackageName(targetPackage);
>>> + int baseLen=jspUri.lastIndexOf("/");
>>> + if( baseLen <0 ) baseLen=0;
>>> + String packageSubs= jspUri.substring(0,
>>> baseLen).replace( '/', '.' );
>>> + clctxt.setServletPackageName( targetPackage + "." +
>>> packageSubs);
>>> }
>>>
>>> setupContext(clctxt);
>>> @@ -593,7 +596,7 @@
>>> } else if (dieLevel != NO_DIE_LEVEL) {
>>> dieOnExit = true;
>>> }
>>> - throw new JasperException( e );
>>> + throw new JasperException( "Error compiling " + file, e );
>>> }
>>> }
>>>
>>>
>>>
>>>
>>>
>>>--
>>>To unsubscribe, e-mail:
>>><ma...@jakarta.apache.org> For additional
>>>commands, e-mail: <ma...@jakarta.apache.org>
>>>
>>
>
>
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
>
--
Hans Bergsten <ha...@gefionsoftware.com>
Gefion Software <http://www.gefionsoftware.com/>
Author of O'Reilly's "JavaServer Pages", covering JSP 1.2 and JSTL 1.0
Details at <http://TheJSPBook.com/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java
Posted by Costin Manolache <cm...@yahoo.com>.
Sorry, I didn't see the patch - I was precompiling the admin and
hit the problem.
BTW - why don't you fix it yourself - you are committer AFAIK :-) ?
Costin
Hans Bergsten wrote:
> costin@apache.org wrote:
>> costin 2003/01/21 11:44:42
>>
>> Modified: jasper2/src/share/org/apache/jasper JspC.java
>> Log:
>> Support for packages in precompiled servlets - otherwise all go to the
>> same package and we get conflicts.
>
> Thanks for finally fixing this, but please use the patch I submitted for
> BugID 14302 instead, since it handles special characters in the path
> as well. The TagLibraryInfoImpl patch (same BugID) is also required to
> support TLDs located in JAR files.
>
> Hans
>
>> Revision Changes Path
>> 1.21 +8 -5
>> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
>>
>> Index: JspC.java
>> ===================================================================
>> RCS file:
>>
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
>> retrieving revision 1.20 retrieving revision 1.21
>> diff -u -r1.20 -r1.21
>> --- JspC.java 31 Dec 2002 14:01:17 -0000 1.20
>> +++ JspC.java 21 Jan 2003 19:44:42 -0000 1.21
>> @@ -547,7 +547,10 @@
>> targetClassName = null;
>> }
>> if (targetPackage != null) {
>> - clctxt.setServletPackageName(targetPackage);
>> + int baseLen=jspUri.lastIndexOf("/");
>> + if( baseLen <0 ) baseLen=0;
>> + String packageSubs= jspUri.substring(0,
>> baseLen).replace( '/', '.' );
>> + clctxt.setServletPackageName( targetPackage + "." +
>> packageSubs);
>> }
>>
>> setupContext(clctxt);
>> @@ -593,7 +596,7 @@
>> } else if (dieLevel != NO_DIE_LEVEL) {
>> dieOnExit = true;
>> }
>> - throw new JasperException( e );
>> + throw new JasperException( "Error compiling " + file, e );
>> }
>> }
>>
>>
>>
>>
>>
>> --
>> To unsubscribe, e-mail:
>> <ma...@jakarta.apache.org> For additional
>> commands, e-mail: <ma...@jakarta.apache.org>
>>
>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper
JspC.java
Posted by Hans Bergsten <ha...@gefionsoftware.com>.
costin@apache.org wrote:
> costin 2003/01/21 11:44:42
>
> Modified: jasper2/src/share/org/apache/jasper JspC.java
> Log:
> Support for packages in precompiled servlets - otherwise all go to the
> same package and we get conflicts.
Thanks for finally fixing this, but please use the patch I submitted for
BugID 14302 instead, since it handles special characters in the path
as well. The TagLibraryInfoImpl patch (same BugID) is also required to
support TLDs located in JAR files.
Hans
> Revision Changes Path
> 1.21 +8 -5 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
>
> Index: JspC.java
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
> retrieving revision 1.20
> retrieving revision 1.21
> diff -u -r1.20 -r1.21
> --- JspC.java 31 Dec 2002 14:01:17 -0000 1.20
> +++ JspC.java 21 Jan 2003 19:44:42 -0000 1.21
> @@ -547,7 +547,10 @@
> targetClassName = null;
> }
> if (targetPackage != null) {
> - clctxt.setServletPackageName(targetPackage);
> + int baseLen=jspUri.lastIndexOf("/");
> + if( baseLen <0 ) baseLen=0;
> + String packageSubs= jspUri.substring(0, baseLen).replace( '/', '.' );
> + clctxt.setServletPackageName( targetPackage + "." + packageSubs);
> }
>
> setupContext(clctxt);
> @@ -593,7 +596,7 @@
> } else if (dieLevel != NO_DIE_LEVEL) {
> dieOnExit = true;
> }
> - throw new JasperException( e );
> + throw new JasperException( "Error compiling " + file, e );
> }
> }
>
>
>
>
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
>
--
Hans Bergsten <ha...@gefionsoftware.com>
Gefion Software <http://www.gefionsoftware.com/>
Author of O'Reilly's "JavaServer Pages", covering JSP 1.2 and JSTL 1.0
Details at <http://TheJSPBook.com/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>