You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@apache.org on 2001/03/23 14:48:56 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/transformation TraxTransformer.java XTTransformer.java
dims 01/03/23 05:48:56
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
HelloAction.java LangSelect.java
SendmailAction.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/generation Tag: xml-cocoon2
ServletGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
DatabaseReader.java ResourceReader.java
src/org/apache/cocoon/selection Tag: xml-cocoon2
BrowserSelectorFactory.java
HostSelectorFactory.java
src/org/apache/cocoon/selection/helpers Tag: xml-cocoon2
CodedSelectorHelper.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
TraxTransformer.java XTTransformer.java
Log:
This is Part I of the effort to eliminate dependency on javax.servlet.http.*;
1. Object Model contains HttpRequest, so use it as is. Don't type-cast it to HttpServletRequest.
2. Object Model contains HttpResponse, so use it as is. Don't type-cast it to HttpServletResponse.
Revision Changes Path
No revision
No revision
1.1.2.12 +3 -3 xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- HelloAction.java 2001/03/19 21:20:13 1.1.2.11
+++ HelloAction.java 2001/03/23 13:48:52 1.1.2.12
@@ -9,7 +9,6 @@
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.ServletContext;
@@ -22,13 +21,14 @@
import org.xml.sax.EntityResolver;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.http.HttpRequest;
/**
* A simple Action that tracks if a <code>Session</code> object
* has been created or not.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/19 21:20:13 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:52 $
*/
public class HelloAction extends ComposerAction {
@@ -37,7 +37,7 @@
* has been created
*/
public Map act (EntityResolver resolver, Map objectModel, String src, Parameters par) throws Exception {
- HttpServletRequest req = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ HttpRequest req = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
if (req != null) {
HttpSession session = req.getSession (false);
1.1.2.7 +5 -5 xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java
Index: LangSelect.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LangSelect.java 2001/03/22 13:58:05 1.1.2.6
+++ LangSelect.java 2001/03/23 13:48:52 1.1.2.7
@@ -18,11 +18,11 @@
import java.util.Map;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.Action;
+import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.avalon.configuration.Parameters;
@@ -76,8 +76,8 @@
objectModel.put("lang", lang);
}
- HttpServletRequest req =
- (HttpServletRequest)(objectModel.get(Constants.REQUEST_OBJECT));
+ HttpRequest req =
+ (HttpRequest)(objectModel.get(Constants.REQUEST_OBJECT));
HttpSession session = req.getSession();
if (session != null) {
@@ -120,8 +120,8 @@
}
String def_lang = par.getParameter("default_lang", LangSelect.DEFAULT_LANG);
- HttpServletRequest req =
- (HttpServletRequest)(objectModel.get(Constants.REQUEST_OBJECT));
+ HttpRequest req =
+ (HttpRequest)(objectModel.get(Constants.REQUEST_OBJECT));
String lang = null;
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/SendmailAction.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SendmailAction.java 2001/03/19 21:20:15 1.1.2.2
+++ SendmailAction.java 2001/03/23 13:48:52 1.1.2.3
@@ -19,13 +19,13 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.AddressException;
-import javax.servlet.http.HttpServletRequest;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Loggable;
import org.apache.avalon.configuration.Parameters;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
@@ -74,7 +74,7 @@
HashMap results = new HashMap();
try {
getLogger().debug("SendmailAction: act start");
- HttpServletRequest request = (HttpServletRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ HttpRequest request = (HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
Properties properties = new Properties(default_properties);
if (parameters.isParameter("smtphost")) {
properties.put("mail.smtp.host",parameters.getParameter("smtphost",null));
No revision
No revision
1.1.2.92 +3 -3 xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.91
retrieving revision 1.1.2.92
diff -u -r1.1.2.91 -r1.1.2.92
--- sitemap.xsl 2001/03/19 21:20:24 1.1.2.91
+++ sitemap.xsl 2001/03/23 13:48:52 1.1.2.92
@@ -65,8 +65,6 @@
import java.util.HashMap;
import java.util.Stack;
- import javax.servlet.http.HttpServletRequest;
-
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
@@ -88,13 +86,15 @@
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.ErrorNotifier;
import org.apache.cocoon.sitemap.Manager;
+ import org.apache.cocoon.environment.http.HttpRequest;
+ import org.apache.cocoon.environment.http.HttpResponse;
/**
* This is the automatically generated class from the sitemap definitions
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.1.2.91 2001/03/19 21:20:24 bloritsch Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.92 2001/03/23 13:48:52 dims Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
No revision
No revision
1.1.2.12 +7 -7 xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ServletGenerator.java 2001/03/19 21:20:33 1.1.2.11
+++ ServletGenerator.java 2001/03/23 13:48:53 1.1.2.12
@@ -11,14 +11,14 @@
import java.io.IOException;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.avalon.configuration.Parameters;
import org.apache.avalon.Composer;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.http.HttpResponse;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -26,21 +26,21 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/19 21:20:33 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:53 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composer {
- protected HttpServletRequest request=null;
- protected HttpServletResponse response=null;
+ protected HttpRequest request=null;
+ protected HttpResponse response=null;
protected ServletContext context=null;
public void setup(EntityResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
- this.request = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
- this.response = (HttpServletResponse) objectModel.get(Constants.RESPONSE_OBJECT);
+ this.request = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ this.response = (HttpResponse) objectModel.get(Constants.RESPONSE_OBJECT);
this.context = (ServletContext) objectModel.get(Constants.CONTEXT_OBJECT);
}
}
No revision
No revision
1.1.2.11 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- RegexpTargetHostMatcherFactory.java 2001/03/12 04:38:56 1.1.2.10
+++ RegexpTargetHostMatcherFactory.java 2001/03/23 13:48:53 1.1.2.11
@@ -27,7 +27,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/12 04:38:56 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/23 13:48:53 $
*/
public class RegexpTargetHostMatcherFactory implements CodeFactory, Loggable {
@@ -87,7 +87,7 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer ();
sb.append("HashMap map = new HashMap ();")
- .append("String host = ((HttpServletRequest)objectModel.get(Constants.REQUEST_OBJECT)).getHeader(\"Host\");")
+ .append("String host = ((HttpRequest)objectModel.get(Constants.REQUEST_OBJECT)).getHeader(\"Host\");")
.append("getLogger().debug(\"Matching against host: \" + host + \".\");")
.append("if(pattern.match(host)) {");
/* Handle parenthesised subexpressions. XXX: could be faster if we count
1.1.2.23 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- RegexpURIMatcherFactory.java 2001/03/12 04:38:56 1.1.2.22
+++ RegexpURIMatcherFactory.java 2001/03/23 13:48:53 1.1.2.23
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/03/12 04:38:56 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/23 13:48:53 $
*/
public class RegexpURIMatcherFactory implements CodeFactory, Loggable {
@@ -102,7 +102,7 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer ();
sb.append("HashMap map = new HashMap ();")
- .append("String uri = ((HttpServletRequest)objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();")
+ .append("String uri = ((HttpRequest)objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();")
.append("if(uri.startsWith(\"/\")) uri = uri.substring(1);")
.append("if(pattern.match(uri)) {");
/* Handle parenthesised subexpressions. XXX: could be faster if we count
1.1.2.31 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- WildcardURIMatcherFactory.java 2001/03/12 04:38:56 1.1.2.30
+++ WildcardURIMatcherFactory.java 2001/03/23 13:48:53 1.1.2.31
@@ -24,7 +24,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/03/12 04:38:56 $
+ * @version CVS $Revision: 1.1.2.31 $ $Date: 2001/03/23 13:48:53 $
*/
public class WildcardURIMatcherFactory implements CodeFactory, Loggable {
@@ -65,7 +65,7 @@
throws ConfigurationException {
//"String uri = ((org.apache.cocoon.environment.http.HttpRequest) objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();" +
return "HashMap map = new HashMap();" +
- "String uri = ((HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();" +
+ "String uri = ((HttpRequest) objectModel.get(Constants.REQUEST_OBJECT)).getRequestURI();" +
"if (uri.startsWith(\"/\")) uri = uri.substring(1);" +
"if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (map, uri, pattern)) {" +
"return map;" +
No revision
No revision
1.1.2.8 +6 -6 xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- DatabaseReader.java 2001/03/12 17:56:18 1.1.2.7
+++ DatabaseReader.java 2001/03/23 13:48:54 1.1.2.8
@@ -35,8 +35,8 @@
import org.xml.sax.SAXException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.http.HttpResponse;
/**
* This Reader pulls a resource from a database. It is configured with
@@ -108,8 +108,8 @@
ResultSet set = statement.executeQuery();
if (set.next() == false) throw new ResourceNotFoundException("There is no image with that key");
- HttpServletResponse res = (HttpServletResponse) objectModel.get(Constants.RESPONSE_OBJECT);
- HttpServletRequest req = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ HttpResponse res = (HttpResponse) objectModel.get(Constants.RESPONSE_OBJECT);
+ HttpRequest req = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
if (this.modifiedSince(set, req, res)) {
Blob object = set.getBlob(1);
@@ -187,7 +187,7 @@
* more prone to change than filesystems, and don't have intrinsic
* timestamps on column updates.
*/
- public boolean modifiedSince(ResultSet set, HttpServletRequest request, HttpServletResponse response)
+ public boolean modifiedSince(ResultSet set, HttpRequest request, HttpResponse response)
throws SQLException {
String lastModified = this.parameters.getParameter("last-modified", null);
@@ -207,7 +207,7 @@
/**
* This method actually performs the serialization.
*/
- public void serialize(Blob object, HttpServletResponse response)
+ public void serialize(Blob object, HttpResponse response)
throws IOException, SQLException {
if (object == null) {
throw new SQLException("The Blob is empty!");
1.1.2.24 +8 -8 xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/ResourceReader.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- ResourceReader.java 2001/03/12 17:53:12 1.1.2.23
+++ ResourceReader.java 2001/03/23 13:48:54 1.1.2.24
@@ -19,8 +19,6 @@
import java.util.Hashtable;
import java.util.Date;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletContext;
import org.apache.cocoon.Constants;
@@ -28,6 +26,8 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.http.HttpResponse;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
@@ -38,7 +38,7 @@
/**
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/12 17:53:12 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/23 13:48:54 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
@@ -66,8 +66,8 @@
* Generates the requested resource.
*/
public void generate() throws IOException, ProcessingException {
- HttpServletRequest req = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
- HttpServletResponse res = (HttpServletResponse) objectModel.get(Constants.RESPONSE_OBJECT);
+ HttpRequest req = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ HttpResponse res = (HttpResponse) objectModel.get(Constants.RESPONSE_OBJECT);
URLFactory urlFactory = null;
try {
@@ -159,12 +159,12 @@
/**
* Checks if the file has been modified
*/
- private boolean modified (long lastModified, HttpServletRequest req, HttpServletResponse res) {
+ private boolean modified (long lastModified, HttpRequest req, HttpResponse res) {
res.setDateHeader("Last-Modified", lastModified);
long if_modified_since = req.getDateHeader("if-modified-since");
if (if_modified_since >= lastModified) {
- res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+ res.setStatus(HttpResponse.SC_NOT_MODIFIED);
}
getLogger().debug("ResourceReader: resource has " + ((if_modified_since < lastModified) ? "" : "not ") + "been modified");
@@ -175,7 +175,7 @@
* Returns the mime-type of the resource in process.
*/
public String getMimeType () {
- ServletContext ctx = (ServletContext) objectModel.get("context");
+ ServletContext ctx = (ServletContext) objectModel.get(Constants.CONTEXT_OBJECT);
if (ctx != null) {
return ctx.getMimeType(this.source);
No revision
No revision
1.1.2.16 +3 -3 xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java
Index: BrowserSelectorFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- BrowserSelectorFactory.java 2001/03/12 04:38:59 1.1.2.15
+++ BrowserSelectorFactory.java 2001/03/23 13:48:55 1.1.2.16
@@ -26,7 +26,7 @@
* @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/12 04:38:59 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/23 13:48:55 $
*/
@@ -73,9 +73,9 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer();
sb.append("if (pattern != null && objectModel.get(Constants.REQUEST_OBJECT) != null) {")
- .append("javax.servlet.http.HttpServletRequest request = (javax.servlet.http.HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);")
+ .append("HttpRequest request = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);")
.append("String userAgent = request.getHeader(\"User-Agent\");")
- .append("javax.servlet.http.HttpServletResponse response = (javax.servlet.http.HttpServletResponse) objectModel.get(Constants.RESPONSE_OBJECT);")
+ .append("HttpResponse response = (HttpResponse) objectModel.get(Constants.RESPONSE_OBJECT);")
.append("response.addHeader(\"Vary\", \"User-Agent\");")
.append("for (int i = 0; i < pattern.length; i++) {")
.append("if (userAgent.indexOf(pattern[i]) != -1) return true;}");
1.1.2.2 +3 -3 xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java
Index: HostSelectorFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/HostSelectorFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HostSelectorFactory.java 2001/03/23 09:05:48 1.1.2.1
+++ HostSelectorFactory.java 2001/03/23 13:48:55 1.1.2.2
@@ -38,7 +38,7 @@
* </map:select>
*
* @author
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/03/23 09:05:48 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/23 13:48:55 $
*/
@@ -85,9 +85,9 @@
throws ConfigurationException {
StringBuffer sb = new StringBuffer();
sb.append("if (pattern != null && objectModel.get(Constants.REQUEST_OBJECT) != null) {")
- .append("javax.servlet.http.HttpServletRequest request = (javax.servlet.http.HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);")
+ .append("HttpRequest request = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);")
.append("String hostServer = request.getHeader(\"host\");")
- .append("javax.servlet.http.HttpServletResponse response = (javax.servlet.http.HttpServletResponse) objectModel.get(Constants.RESPONSE_OBJECT);")
+ .append("HttpResponse response = (HttpResponse) objectModel.get(Constants.RESPONSE_OBJECT);")
.append("response.addHeader(\"Vary\", \"host\");")
.append("for (int i = 0; i < pattern.length; i++) {")
.append("if (hostServer.indexOf(pattern[i]) != -1) return true;}");
No revision
No revision
1.1.2.4 +8 -7 xml-cocoon/src/org/apache/cocoon/selection/helpers/Attic/CodedSelectorHelper.java
Index: CodedSelectorHelper.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/helpers/Attic/CodedSelectorHelper.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CodedSelectorHelper.java 2001/03/06 21:03:37 1.1.2.3
+++ CodedSelectorHelper.java 2001/03/23 13:48:55 1.1.2.4
@@ -13,10 +13,11 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.http.HttpResponse;
+
/**
* This abstract class provides the basis for testing the environment with
* developer specified java code via the CodedSelectorFactory. This class also
@@ -24,7 +25,7 @@
* variables for developer ease.
*
* @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/03/06 21:03:37 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/03/23 13:48:55 $
*/
public abstract class CodedSelectorHelper
{
@@ -36,15 +37,15 @@
{
context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
- request = (HttpServletRequest)
+ request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- response = (HttpServletResponse)
+ response = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);
session = request.getSession(false);
}
protected ServletContext context;
- protected HttpServletRequest request;
- protected HttpServletResponse response;
+ protected HttpRequest request;
+ protected HttpResponse response;
protected HttpSession session;
}
No revision
No revision
1.1.2.12 +3 -3 xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- TraxTransformer.java 2001/03/19 21:20:47 1.1.2.11
+++ TraxTransformer.java 2001/03/23 13:48:56 1.1.2.12
@@ -17,7 +17,7 @@
import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.avalon.Component;
import org.apache.avalon.configuration.ConfigurationException;
@@ -58,7 +58,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/19 21:20:47 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:56 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable, Recyclable, Configurable {
@@ -161,7 +161,7 @@
throws SAXException, ProcessingException, IOException {
/** The Request object */
- HttpServletRequest request = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ HttpRequest request = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
// Check the stylesheet uri
String xsluri = src;
1.1.2.17 +3 -3 xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- XTTransformer.java 2001/03/19 21:20:48 1.1.2.16
+++ XTTransformer.java 2001/03/23 13:48:56 1.1.2.17
@@ -14,7 +14,7 @@
import java.util.Map;
import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.log.Logger;
import org.apache.avalon.Loggable;
@@ -71,7 +71,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:ssahuc@imediation.com">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/19 21:20:48 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/03/23 13:48:56 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composer, Loggable, Poolable {
@@ -119,7 +119,7 @@
throws SAXException, ProcessingException, IOException {
/** The Request object */
- HttpServletRequest request = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
+ HttpRequest request = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
if (request == null) {
throw new ProcessingException ("Missing request object in objectModel");
}
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org
Re: cvs commit: xml-cocoon/src/org/apache/cocoon/transformation
TraxTransformer.java XTTransformer.java
Posted by Berin Loritsch <bl...@apache.org>.
Giacomo Pati wrote:
>
> dims@apache.org wrote:
> >
> > dims 01/03/23 05:48:56
> >
> > Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
> > HelloAction.java LangSelect.java
> > SendmailAction.java
> > src/org/apache/cocoon/components/language/markup/sitemap/java
> > Tag: xml-cocoon2 sitemap.xsl
> > src/org/apache/cocoon/generation Tag: xml-cocoon2
> > ServletGenerator.java
> > src/org/apache/cocoon/matching Tag: xml-cocoon2
> > RegexpTargetHostMatcherFactory.java
> > RegexpURIMatcherFactory.java
> > WildcardURIMatcherFactory.java
> > src/org/apache/cocoon/reading Tag: xml-cocoon2
> > DatabaseReader.java ResourceReader.java
> > src/org/apache/cocoon/selection Tag: xml-cocoon2
> > BrowserSelectorFactory.java
> > HostSelectorFactory.java
> > src/org/apache/cocoon/selection/helpers Tag: xml-cocoon2
> > CodedSelectorHelper.java
> > src/org/apache/cocoon/transformation Tag: xml-cocoon2
> > TraxTransformer.java XTTransformer.java
> > Log:
> > This is Part I of the effort to eliminate dependency on javax.servlet.http.*;
> >
> > 1. Object Model contains HttpRequest, so use it as is. Don't type-cast it to HttpServletRequest.
> > 2. Object Model contains HttpResponse, so use it as is. Don't type-cast it to HttpServletResponse.
>
> I have a simple question regarding the abstraction from the servlet
> environment. Shouldn't we have a org.apache.cocoon.environment.Request
> and org.apache.cocoon.environment.Response interfaces for use by all the
> components to gain independancy? A specific environment can implement
> those interfaces and wrap to the actual environmental objects. Is this
> part of Part II?
Hopefully. It goes a long way just having all dependancies internal to
Cocoon.
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: cvs commit: xml-cocoon/src/org/apache/cocoon/transformation
TraxTransformer.java XTTransformer.java
Posted by Giacomo Pati <gi...@apache.org>.
dims@apache.org wrote:
>
> dims 01/03/23 05:48:56
>
> Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
> HelloAction.java LangSelect.java
> SendmailAction.java
> src/org/apache/cocoon/components/language/markup/sitemap/java
> Tag: xml-cocoon2 sitemap.xsl
> src/org/apache/cocoon/generation Tag: xml-cocoon2
> ServletGenerator.java
> src/org/apache/cocoon/matching Tag: xml-cocoon2
> RegexpTargetHostMatcherFactory.java
> RegexpURIMatcherFactory.java
> WildcardURIMatcherFactory.java
> src/org/apache/cocoon/reading Tag: xml-cocoon2
> DatabaseReader.java ResourceReader.java
> src/org/apache/cocoon/selection Tag: xml-cocoon2
> BrowserSelectorFactory.java
> HostSelectorFactory.java
> src/org/apache/cocoon/selection/helpers Tag: xml-cocoon2
> CodedSelectorHelper.java
> src/org/apache/cocoon/transformation Tag: xml-cocoon2
> TraxTransformer.java XTTransformer.java
> Log:
> This is Part I of the effort to eliminate dependency on javax.servlet.http.*;
>
> 1. Object Model contains HttpRequest, so use it as is. Don't type-cast it to HttpServletRequest.
> 2. Object Model contains HttpResponse, so use it as is. Don't type-cast it to HttpServletResponse.
I have a simple question regarding the abstraction from the servlet
environment. Shouldn't we have a org.apache.cocoon.environment.Request
and org.apache.cocoon.environment.Response interfaces for use by all the
components to gain independancy? A specific environment can implement
those interfaces and wrap to the actual environmental objects. Is this
part of Part II?
Giacomo
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org