joerg 2003/10/22 13:26:22
Modified: src/blocks/jsp/java/org/apache/cocoon/generation
JspGenerator.java
Removed: src/blocks/jms/lib .cvsignore
src/blocks/apples/lib .cvsignore
src/blocks/jsp/lib .cvsignore
src/blocks/linotype/lib .cvsignore
src/blocks/taglib/lib .cvsignore
src/blocks/petstore/lib .cvsignore
src/blocks/xmlform/lib .cvsignore
src/blocks/html/lib .cvsignore
src/blocks/python/lib .cvsignore
src/blocks/naming/lib .cvsignore
src/blocks/jxforms/lib .cvsignore
src/blocks/mail/lib .cvsignore
src/blocks/portal/lib .cvsignore
src/blocks/web3/lib .cvsignore
src/blocks/linkrewriter/lib .cvsignore
src/blocks/php/lib .cvsignore
src/blocks/asciiart/lib .cvsignore
src/blocks/proxy/lib .cvsignore
src/blocks/slop/lib .cvsignore
src/blocks/portal-fw/lib .cvsignore
src/blocks/authentication-fw/lib .cvsignore
src/blocks/profiler/lib .cvsignore
src/blocks/precept/lib .cvsignore
src/blocks/eventcache/lib .cvsignore
src/blocks/databases/lib .cvsignore
src/blocks/midi/lib .cvsignore
src/blocks/session-fw/lib .cvsignore
Log:
as block lib dirs are no longer needed, we can remove .cvsignore files,
this should also increase build speed a bit, because some targets depend on
existing lib dirs
Revision Changes Path
1.8 +31 -12
cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/jsp/java/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JspGenerator.java 5 Sep 2003 07:04:35 -0000 1.7
+++ JspGenerator.java 22 Oct 2003 20:26:22 -0000 1.8
@@ -50,24 +50,27 @@
*/
package org.apache.cocoon.generation;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.jsp.JSPEngine;
-import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.http.HttpEnvironment;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
/**
- * Allows JSP to be used as a generator. Builds upon the JSP servlet
+ * Allows JSP to be used as a generator. Builds upon the JSP servlet
* functionality - overrides the output method in order to pipe the
* results into SAX events.
*
@@ -76,6 +79,8 @@
*/
public class JspGenerator extends ServletGenerator {
+ protected String jspEncoding = null;
+
/**
* Generate XML data from JSP.
*/
@@ -96,6 +101,16 @@
JSPEngine engine = null;
SAXParser parser = null;
try {
+ Source inputSource = null;
+ try {
+ inputSource = super.resolver.resolveURI(this.source);
+ inputSource.getURI();
+ } catch (SourceException se) {
+ throw SourceUtil.handle("Error during resolving of '" +
this.source + "'.", se);
+ } finally {
+ super.resolver.release(inputSource);
+ }
+
// TODO (KP): Should we exclude not supported protocols, say
'context'?
String url = this.source;
// absolute path is processed as is
@@ -103,8 +118,12 @@
// get current request path
String servletPath = httpRequest.getServletPath();
// remove sitemap URI part
- String sitemapURI =
ObjectModelHelper.getRequest(objectModel).getSitemapURI();
- servletPath = servletPath.substring(0,
servletPath.indexOf(sitemapURI));
+ String sitemapURI = this.request.getSitemapURI();
+ if (servletPath.indexOf(sitemapURI) != -1) {
+ servletPath = servletPath.substring(0,
servletPath.indexOf(sitemapURI));
+ } else {
+ servletPath = servletPath.substring(0,
servletPath.lastIndexOf("/") + 1);
+ }
url = servletPath + url;
}
