Re: cvs commit:jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resourcesmessages.properties
Thans, Kin-Man!
- Mark
On Tue, 2002-08-20 at 11:50, [EMAIL PROTECTED] wrote:
kinman 2002/08/20 08:50:23
Modified:jasper2/src/share/org/apache/jasper JspC.java
jasper2/src/share/org/apache/jasper/compiler Generator.java
ImplicitTagLibraryInfo.java Parser.java
ParserController.java TagFileProcessor.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
- Submitted by Mark Roth:
- Implemented the value attribute of jsp:doBody for classic
tag handlers.
- Stubbed out JspC with getJspConfig() so it compiles.
- Added null check for addInclude() to handle the case where there
are no preludes or codas.
- Now accepts /WEB-INF/tags as well as /WEB-INF/tags/ for tag file
default directory.
- ParserController now uses path name to determine if the given
element is a tag file instead of searching for tag directive.
- In a tag file, an attribute directive with a fragment attribute
must not allow a rtexprvalue attribute, and must fix its value
to true. Fixed implementation to comply with spec.
- Fixed preamble and postamble generator for Tag Files. Was not
generating declarations, tag handler pools, methods buffer,
helper fragment, etc. Generator now shares code between servlet
and tag handler pre and post ambles.
- Even though spec is not clear that they're required,
added implicit objects to doTag() so they are available in
tag files.
Revision ChangesPath
1.13 +13 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspC.java 26 Jun 2002 16:50:38 - 1.12
+++ JspC.java 20 Aug 2002 15:50:22 - 1.13
@@ -75,6 +75,7 @@
import org.apache.jasper.logging.Logger;
import org.apache.jasper.logging.JasperLogger;
+import org.apache.jasper.compiler.JspConfig;
/**
* Shell for the jspc compiler. Handles all options associated with the
@@ -912,6 +913,15 @@
Constants.jasperLog.setVerbosityLevel(verbosityLevel);
}
+
+/**
+ * Obtain JSP configuration informantion specified in web.xml.
+ */
+public JspConfig getJspConfig() {
+// XXX - Stubbed out so Jasper compiles.
+initServletContext();
+return new JspConfig( context );
+}
}
1.72 +240 -97
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Generator.java 20 Aug 2002 01:42:38 - 1.71
+++ Generator.java 20 Aug 2002 15:50:22 - 1.72
@@ -170,6 +170,7 @@
out.println();
page.visit(new DeclarationVisitor());
+ out.println();
}
/**
@@ -329,23 +330,25 @@
}
/**
- * Generates the beginning of the static portion of the servelet.
+ * Generate preamble package name
+ * (shared by servlet and tag handler preamble generation)
*/
-private void generatePreamble(Node.Nodes page) throws JasperException {
-
- String servletPackageName = ctxt.getServletPackageName();
- String servletClassName = ctxt.getServletClassName();
- String serviceMethodName = Constants.SERVICE_METHOD_NAME;
-
- // First the package name:
-
- if (! .equals(servletPackageName) servletPackageName != null) {
- out.printil(package + servletPackageName + ;);
+private void genPreamblePackage( String packageName )
+throws JasperException
+{
+ if (! .equals(packageName) packageName != null) {
+ out.printil(package + packageName + ;);
out.println();
}
-
- // Generate imports
-
+}
+
+/**
+ * Generate preamble imports
+ * (shared by servlet and tag handler preamble generation)
+ */
+private void genPreambleImports()
+throws JasperException
+{
Iterator iter = pageInfo.getImports().iterator();
while (iter.hasNext()) {
out.printin(import );
@@ -353,31 +356,21 @@
out.println(;);
}
out.println();
+}
- // Generate
Re: cvs commit:jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resourcesmessages.properties
Those changes are for tomcat-jasper-5 or tomcat-jasper-4 cause i made a
cvs update on jtj branch tomcat_4_branch and there were no updates today
On Thu, 2002-07-25 at 18:28, [EMAIL PROTECTED] wrote:
luehe 2002/07/25 15:28:46
Modified:jasper2/src/share/org/apache/jasper
JspCompilationContext.java
jasper2/src/share/org/apache/jasper/compiler Parser.java
TagFileProcessor.java TagLibraryInfoImpl.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Added: jasper2/src/share/org/apache/jasper/compiler
ImplicitTagLibraryInfo.java
Log:
Added support for implicit tag libraries containing the tag handlers of tag files
stored in a directory without a TLD file
Revision ChangesPath
1.10 +12 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspCompilationContext.java 24 Jul 2002 09:09:47 - 1.9
+++ JspCompilationContext.java 25 Jul 2002 22:28:45 - 1.10
@@ -61,19 +61,16 @@
package org.apache.jasper;
+import java.io.*;
+import java.net.*;
+import java.util.Set;
+import javax.servlet.ServletContext;
+import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.compiler.JspReader;
import org.apache.jasper.compiler.ServletWriter;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
import org.apache.jasper.compiler.Compiler;
import org.apache.jasper.servlet.JspServletWrapper;
import org.apache.jasper.servlet.JasperLoader;
-import javax.servlet.ServletContext;
-import org.apache.jasper.compiler.JspRuntimeContext;
/**
* A place holder for various things that are used through out the JSP
@@ -233,6 +230,10 @@
public URL getResource(String res) throws MalformedURLException {
return context.getResource(canonicalURI(res));
+}
+
+public Set getResourcePaths(String path) {
+return context.getResourcePaths(canonicalURI(path));
}
/**
1.13 +25 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Parser.java 25 Jul 2002 19:02:16 - 1.12
+++ Parser.java 25 Jul 2002 22:28:45 - 1.13
@@ -368,13 +368,28 @@
Attributes attrs = parseAttributes();
String uri = attrs.getValue(uri);
String prefix = attrs.getValue(prefix);
- if (uri != null prefix != null) {
- // Errors to be checked in Validator
- String[] location = ctxt.getTldLocation(uri);
- TagLibraryInfo tl = new TagLibraryInfoImpl(ctxt, parserController,
- prefix, uri, location,
- err);
- taglibs.put(prefix, tl);
+ if (prefix != null) {
+ TagLibraryInfo tagLibInfo = null;
+ if (uri != null) {
+ // Errors to be checked in Validator
+ String[] location = ctxt.getTldLocation(uri);
+ tagLibInfo = new TagLibraryInfoImpl(ctxt, parserController,
+ prefix, uri, location,
+ err);
+ } else {
+ String tagdir = attrs.getValue(tagdir);
+ if (tagdir != null) {
+ tagLibInfo = ImplicitTagLibraryInfo.getTabLibraryInfo(
+ctxt,
+ parserController,
+ prefix,
+ tagdir,
+ err);
+ }
+ }
+ if (tagLibInfo != null) {
+ taglibs.put(prefix, tagLibInfo);
+ }
}
new Node.TaglibDirective(attrs, start, parent);
1.3 +12 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
Re: cvs commit:jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resourcesmessages.properties
- Original Message - From: Adrian Almenar [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Friday, July 26, 2002 7:03 PM Subject: Re: cvs commit:jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resourcesme ssages.properties Those changes are for tomcat-jasper-5 or tomcat-jasper-4 cause i made a cvs update on jtj branch tomcat_4_branch and there were no updates today They are for tomcat-jasper-5. Otherwise the commit message would say tomcat_4_branch. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
