dims 01/03/30 09:14:44
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractDatabaseAction.java Action.java
DatabaseAddAction.java DatabaseDeleteAction.java
DatabaseUpdateAction.java HelloAction.java
LangSelect.java OraAddAction.java
SendmailAction.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPRequestHelper.java
XSPResponseHelper.java XSPUtil.java
src/org/apache/cocoon/environment Tag: xml-cocoon2
AbstractEnvironment.java
src/org/apache/cocoon/environment/commandline Tag:
xml-cocoon2 CommandLineRequest.java
CommandLineResponse.java
src/org/apache/cocoon/environment/http Tag: xml-cocoon2
HttpEnvironment.java HttpRequest22.java
HttpRequest23.java HttpResponse22.java
HttpResponse23.java RequestWrapper22.java
RequestWrapper23.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractServerPage.java RequestGenerator.java
ServletGenerator.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
DatabaseReader.java ResourceReader.java
src/org/apache/cocoon/selection/helpers Tag: xml-cocoon2
CodedSelectorHelper.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
LinkTranslator.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
TraxTransformer.java XTTransformer.java
src/org/apache/cocoon/util Tag: xml-cocoon2 ClassUtils.java
src/org/apache/cocoon/util/url/context Tag: xml-cocoon2
Handler.java
Added: src/org/apache/cocoon/environment Tag: xml-cocoon2
Context.java Request.java Response.java
src/org/apache/cocoon/environment/http Tag: xml-cocoon2
HttpContext.java
Log:
Part III - Added Context/Request/Response interfaces in
org.apache.cocoon.environment package
TODO:
1. Handle HttpSession and Cookie in a similar fashion.
2. Check if anything is broken.
3. Fix Command Line Environment (Once the dust settles!)
4. Visit environment.Request & environment.Response to
check if anything else needs to be removed.
Revision Changes Path
No revision
No revision
1.1.2.24 +4 -4
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- AbstractDatabaseAction.java 2001/03/26 19:40:41 1.1.2.23
+++ AbstractDatabaseAction.java 2001/03/30 17:14:08 1.1.2.24
@@ -50,7 +50,7 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.components.parser.Parser;
@@ -174,7 +174,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/26 19:40:41 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/30 17:14:08 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplimentaryConfigurableAction implements Configurable {
protected Map files = new HashMap();
@@ -237,7 +237,7 @@
/**
* Get the Statement column so that the results are mapped correctly.
*/
- protected Object getColumn(ResultSet set, HttpRequest request,
Configuration entry)
+ protected Object getColumn(ResultSet set, Request request, Configuration
entry)
throws Exception {
Integer type = (Integer)
AbstractDatabaseAction.typeConstants.get(entry.getAttribute("type"));
String attribute = entry.getAttribute("param", "");
@@ -311,7 +311,7 @@
/**
* Set the Statement column so that the results are mapped correctly.
*/
- protected void setColumn(PreparedStatement statement, int position,
HttpRequest request, Configuration entry)
+ protected void setColumn(PreparedStatement statement, int position,
Request request, Configuration entry)
throws Exception {
Integer typeObject = (Integer)
AbstractDatabaseAction.typeConstants.get(entry.getAttribute("type"));
1.1.2.8 +2 -2 xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/Action.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Action.java 2001/03/19 21:20:11 1.1.2.7
+++ Action.java 2001/03/30 17:14:08 1.1.2.8
@@ -19,7 +19,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/03/19 21:20:11 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/30 17:14:08 $
*/
public interface Action extends Component, ThreadSafe {
/**
@@ -35,7 +35,7 @@
* @param objectModel The <code>Map</code> with object of the
* calling environment which can be used
* to select values this controller may need
- * (ie HttpRequest, HttpResponse).
+ * (ie Request, Response).
* @param source A source <code>String</code> to the Action
* @param parameters The <code>Parameters</code> for this invocation
* @return Map The returned <code>Map</code> object with
1.1.2.20 +3 -3
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- DatabaseAddAction.java 2001/03/19 21:20:12 1.1.2.19
+++ DatabaseAddAction.java 2001/03/30 17:14:09 1.1.2.20
@@ -31,7 +31,7 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.avalon.util.datasource.DataSourceComponent;
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/03/19 21:20:12 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/03/30 17:14:09 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
@@ -62,7 +62,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
if (conn.getAutoCommit() == true) {
conn.setAutoCommit(false);
1.1.2.11 +3 -3
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- DatabaseDeleteAction.java 2001/03/19 21:20:12 1.1.2.10
+++ DatabaseDeleteAction.java 2001/03/30 17:14:09 1.1.2.11
@@ -31,7 +31,7 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.avalon.util.datasource.DataSourceComponent;
@@ -43,7 +43,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/19 21:20:12 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/30 17:14:09 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
@@ -63,7 +63,7 @@
String query = this.getDeleteQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
if (conn.getAutoCommit() == true) {
conn.setAutoCommit(false);
1.1.2.16 +3 -3
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- DatabaseUpdateAction.java 2001/03/19 21:20:12 1.1.2.15
+++ DatabaseUpdateAction.java 2001/03/30 17:14:10 1.1.2.16
@@ -31,7 +31,7 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.avalon.util.datasource.DataSourceComponent;
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/19 21:20:12 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/30 17:14:10 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
@@ -60,7 +60,7 @@
String query = this.getUpdateQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
if (conn.getAutoCommit() == true) {
conn.setAutoCommit(false);
1.1.2.13 +5 -5
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- HelloAction.java 2001/03/23 13:48:52 1.1.2.12
+++ HelloAction.java 2001/03/30 17:14:10 1.1.2.13
@@ -21,14 +21,14 @@
import org.xml.sax.EntityResolver;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
/**
* A simple Action that tracks if a <code>Session</code> object
* has been created or not.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:52 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/30 17:14:10 $
*/
public class HelloAction extends ComposerAction {
@@ -37,9 +37,9 @@
* has been created
*/
public Map act (EntityResolver resolver, Map objectModel, String src,
Parameters par) throws Exception {
- HttpRequest req = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- if (req != null) {
- HttpSession session = req.getSession (false);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
+ if (request != null) {
+ HttpSession session = request.getSession (false);
if (session != null) {
if (session.isNew()) {
1.1.2.8 +10 -10
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.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- LangSelect.java 2001/03/23 13:48:52 1.1.2.7
+++ LangSelect.java 2001/03/30 17:14:11 1.1.2.8
@@ -22,7 +22,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.Action;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.avalon.configuration.Parameters;
@@ -76,10 +76,10 @@
objectModel.put("lang", lang);
}
- HttpRequest req =
- (HttpRequest)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request =
+ (Request)(objectModel.get(Constants.REQUEST_OBJECT));
- HttpSession session = req.getSession();
+ HttpSession session = request.getSession();
if (session != null) {
if (session.getAttribute("lang") == null) {
session.setAttribute("lang", lang);
@@ -120,15 +120,15 @@
}
String def_lang = par.getParameter("default_lang",
LangSelect.DEFAULT_LANG);
- HttpRequest req =
- (HttpRequest)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request =
+ (Request)(objectModel.get(Constants.REQUEST_OBJECT));
String lang = null;
- lang = req.getParameter("lang");
+ lang = request.getParameter("lang");
if (lang == null) {
- HttpSession session = req.getSession(false);
+ HttpSession session = request.getSession(false);
if (session != null) {
Object session_lang = session.getAttribute("lang");
if (session_lang != null) {
@@ -139,7 +139,7 @@
}
if (lang == null) {
- Cookie[] cookies = req.getCookies();
+ Cookie[] cookies = request.getCookies();
if (cookies != null) {
for ( int i = 0; i < cookies.length; i++) {
Cookie cookie = cookies[i];
@@ -152,7 +152,7 @@
if (lang == null) {
- Enumeration locales = req.getLocales();
+ Enumeration locales = request.getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale)(locales.nextElement());
langs_user.add(locale.getLanguage());
1.1.2.13 +3 -3
xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- OraAddAction.java 2001/03/26 19:40:42 1.1.2.12
+++ OraAddAction.java 2001/03/30 17:14:11 1.1.2.13
@@ -14,7 +14,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import java.util.Map;
@@ -43,7 +43,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/26 19:40:42 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/30 17:14:11 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
@@ -64,7 +64,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
if (conn.getAutoCommit() == true) {
conn.setAutoCommit(false);
1.1.2.4 +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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SendmailAction.java 2001/03/23 13:48:52 1.1.2.3
+++ SendmailAction.java 2001/03/30 17:14:12 1.1.2.4
@@ -25,7 +25,7 @@
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.cocoon.environment.Request;
import org.apache.log.Logger;
import org.xml.sax.EntityResolver;
@@ -74,7 +74,7 @@
HashMap results = new HashMap();
try {
getLogger().debug("SendmailAction: act start");
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)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.13 +60 -60
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XSPRequestHelper.java 2001/03/26 19:40:44 1.1.2.12
+++ XSPRequestHelper.java 2001/03/30 17:14:18 1.1.2.13
@@ -9,7 +9,7 @@
import java.util.Enumeration;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import javax.servlet.http.HttpSession;
import java.util.Map;
import java.util.Vector;
@@ -24,7 +24,7 @@
* The <code>HttpServletRequest</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/26 19:40:44 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/30 17:14:18 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -48,7 +48,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
elementData(contentHandler, "uri", request.getRequestURI());
}
@@ -61,7 +61,7 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getRequestURI();
}
@@ -78,7 +78,7 @@
String name,
String defaultValue
) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
String value = request.getParameter(name);
if (value == null) {
@@ -106,7 +106,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -132,7 +132,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -162,7 +162,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
start(contentHandler, "parameter-names");
Enumeration e = request.getParameterNames();
@@ -184,7 +184,7 @@
Map objectModel,
String name
) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getHeader(name);
}
@@ -203,7 +203,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -233,7 +233,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
start(contentHandler, "header-names");
Enumeration e = request.getHeaderNames();
@@ -257,7 +257,7 @@
Map objectModel,
String name) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
HttpSession session = request.getSession(false);
return session.getAttribute(name);
}
@@ -275,7 +275,7 @@
String name,
String defaultValue) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
HttpSession session = request.getSession(false);
Object value = null;
@@ -300,7 +300,7 @@
Map objectModel,
String name) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.removeAttribute(name);
}
@@ -314,7 +314,7 @@
Map objectModel,
String name) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getAttribute(name);
}
@@ -329,7 +329,7 @@
String name,
Object value) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.setAttribute(name, value);
}
@@ -351,7 +351,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -374,9 +374,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getRemoteUser();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getRemoteUser();
+ }
/**
* Output the login of the user making the request
@@ -392,9 +392,9 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- elementData(contentHandler, "remote-user", request.getRemoteUser());
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ elementData(contentHandler, "remote-user", request.getRemoteUser());
+ }
/**
@@ -406,9 +406,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getMethod();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getMethod();
+ }
/**
* Output the name of the HTTP method with which the request was made,
@@ -423,9 +423,9 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- elementData(contentHandler, "method", request.getMethod());
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ elementData(contentHandler, "method", request.getMethod());
+ }
/**
* Output the query string that is contained in the request URL after
the path,
@@ -437,9 +437,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getQueryString();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getQueryString();
+ }
/**
* Output the query string that is contained in the request URL after
the path,
@@ -455,9 +455,9 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- elementData(contentHandler, "query-string", request.getQueryString());
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ elementData(contentHandler, "query-string", request.getQueryString());
+ }
/**
* Output the name and version of the protocol the request uses in the
form of
@@ -469,9 +469,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getProtocol();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getProtocol();
+ }
/**
* Output the name and version of the protocol the request uses in the
form of
@@ -487,7 +487,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
elementData(contentHandler, "protocol", request.getProtocol());
}
@@ -502,9 +502,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getRemoteHost();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getRemoteHost();
+ }
/**
* Output the fully qualified name of the client that sent the request,
or
@@ -521,7 +521,7 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
elementData(contentHandler, "remote-user", request.getRemoteHost());
}
@@ -534,9 +534,9 @@
Map objectModel
)
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
- return request.getRemoteAddr();
- }
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getRemoteAddr();
+ }
/**
* Output the IP address of the client that sent the request
@@ -551,9 +551,9 @@
)
throws SAXException
{
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
elementData(contentHandler, "remote-address", request.getRemoteAddr());
- }
+ }
/**
@@ -563,7 +563,7 @@
*/
public static boolean isSecure(
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.isSecure();
}
@@ -576,7 +576,7 @@
public static String getServerName(
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getServerName();
}
@@ -588,7 +588,7 @@
public static int getServerPort(
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getServerPort();
}
@@ -600,7 +600,7 @@
*/
public static Vector getSessionAttributeNames (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
Vector v = new Vector();
Enumeration e = request.getSession().getAttributeNames();
@@ -621,7 +621,7 @@
*/
public static long getSessionCreationTime (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getSession().getCreationTime();
}
@@ -632,7 +632,7 @@
*/
public static String getSessionId (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getSession().getId();
}
@@ -643,7 +643,7 @@
*/
public static long getSessionLastAccessedTime (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getSession().getLastAccessedTime();
}
@@ -654,7 +654,7 @@
*/
public static long getSessionMaxInactiveInterval (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getSession().getMaxInactiveInterval();
}
@@ -667,7 +667,7 @@
public static void setSessionMaxInactiveInterval (
Map objectModel,
int interval) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.getSession().setMaxInactiveInterval(interval);
}
@@ -678,7 +678,7 @@
*/
public static void invalidateSession (
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.getSession().invalidate();
}
@@ -690,7 +690,7 @@
*/
public static boolean isSessionNew(
Map objectModel) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
return request.getSession().isNew();
}
@@ -704,7 +704,7 @@
Map objectModel,
String name) {
- HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
request.getSession().removeAttribute(name);
}
}
1.1.2.11 +8 -8
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPResponseHelper.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- XSPResponseHelper.java 2001/03/23 19:38:07 1.1.2.10
+++ XSPResponseHelper.java 2001/03/30 17:14:19 1.1.2.11
@@ -11,7 +11,7 @@
import java.util.Enumeration;
import java.util.Map;
-import org.apache.cocoon.environment.http.HttpResponse;
+import org.apache.cocoon.environment.Response;
import org.xml.sax.ContentHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -22,10 +22,10 @@
import org.apache.log.LogKit;
/**
- * The XSP <code>HttpResponse</code> object helper
+ * The XSP <code>Response</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/23 19:38:07 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/30 17:14:19 $
*/
public class XSPResponseHelper extends XSPObjectHelper {
/**
@@ -44,7 +44,7 @@
* @param value The header value
*/
public static void setHeader(Map objectModel, String name, String value) {
- HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
response.setHeader(name, value);
}
@@ -60,7 +60,7 @@
String name,
String value
) {
- HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
response.addHeader(name, value);
}
@@ -71,7 +71,7 @@
* @param type The content type
*/
public static void setContentType(Map objectModel, String type) {
- HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
response.setContentType(type);
}
@@ -83,7 +83,7 @@
*/
public static void sendRedirect(Map objectModel, String location) {
try {
- HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response =
(Response)objectModel.get(Constants.RESPONSE_OBJECT);
response.sendRedirect(response.encodeRedirectURL(location));
}
catch (IOException e)
{LogKit.getLoggerFor("cocoon").warn("XSPResponseHelper.sendRedirect", e);}
@@ -99,7 +99,7 @@
Map objectModel,
String input
) {
- HttpResponse response =
(HttpResponse)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response =
(Response)objectModel.get(Constants.RESPONSE_OBJECT);
return response.encodeURL(input);
}
1.1.2.10 +4 -7
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPUtil.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- XSPUtil.java 2001/03/23 19:38:08 1.1.2.9
+++ XSPUtil.java 2001/03/30 17:14:21 1.1.2.10
@@ -9,8 +9,6 @@
package org.apache.cocoon.components.language.markup.xsp;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.File;
@@ -36,6 +34,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.Context;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.util.Tokenizer;
@@ -44,13 +43,11 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.dom.DOMBuilder;
-import javax.servlet.ServletContext;
-
/**
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.1.2.9 $ $Date: 2001/03/23 19:38:08 $
+ * @version $Revision: 1.1.2.10 $ $Date: 2001/03/30 17:14:21 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -103,11 +100,11 @@
public static String relativeFilename(String filename, Map objectModel)
throws IOException {
- ServletContext context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
File file = new File(filename);
if (file.isAbsolute()) {
return filename;
}
+ Context context = (Context)
objectModel.get(Constants.CONTEXT_OBJECT);
return
NetUtils.getPath(context.getResource(filename).toExternalForm());
}
@@ -281,7 +278,7 @@
public static Object getContextAttribute(Map objectModel, String name)
{
- ServletContext context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
+ Context context = (Context)
objectModel.get(Constants.CONTEXT_OBJECT);
return context.getAttribute(name);
}
}
No revision
No revision
1.1.2.13 +0 -4
xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/AbstractEnvironment.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- AbstractEnvironment.java 2001/03/12 05:55:20 1.1.2.12
+++ AbstractEnvironment.java 2001/03/30 17:14:23 1.1.2.13
@@ -15,10 +15,6 @@
import java.util.Map;
import java.util.HashMap;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.cocoon.environment.Environment;
import org.apache.avalon.AbstractLoggable;
No revision
No revision
1.1.2.1 +30 -0
xml-cocoon/src/org/apache/cocoon/environment/Attic/Context.java
1.1.2.1 +733 -0
xml-cocoon/src/org/apache/cocoon/environment/Attic/Request.java
1.1.2.1 +301 -0
xml-cocoon/src/org/apache/cocoon/environment/Attic/Response.java
No revision
No revision
1.1.2.10 +6 -8
xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- CommandLineRequest.java 2001/02/25 00:30:12 1.1.2.9
+++ CommandLineRequest.java 2001/03/30 17:14:26 1.1.2.10
@@ -18,25 +18,23 @@
import java.util.Map;
import java.util.Iterator;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
-
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.cocoon.environment.Request;
+
/**
* Creates a specific servlet request simulation from command line usage.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/25 00:30:12 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/30 17:14:26 $
*/
/*
* NOTE: method with a non-compliant implementation are marked with FIXME
* and should be fixed in the future if required
*/
-public class CommandLineRequest implements HttpServletRequest {
+public class CommandLineRequest implements Request {
private class IteratorWrapper implements Enumeration {
private Iterator iterator;
@@ -80,6 +78,8 @@
this.headers = headers;
}
+ public Object get(String name) { return getAttribute(name); }
+
public String getContextPath() { return contextPath; }
public String getServletPath() { return servletPath; }
public String getPathInfo() { return pathInfo; }
@@ -136,7 +136,6 @@
}
public BufferedReader getReader() throws IOException { return null; }
- public ServletInputStream getInputStream() throws IOException { return
null; }
public String getCharacterEncoding() { return characterEncoding; }
public int getContentLength() { return -1; }
@@ -165,7 +164,6 @@
public String getAuthType() { return null; }
public boolean isSecure() { return false; }
- public RequestDispatcher getRequestDispatcher(String path) { return
null; }
public boolean isUserInRole(String role) { return false; }
public java.security.Principal getUserPrincipal() { return null; }
1.1.2.6 +4 -8
xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineResponse.java
Index: CommandLineResponse.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineResponse.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CommandLineResponse.java 2000/12/05 22:02:03 1.1.2.5
+++ CommandLineResponse.java 2001/03/30 17:14:27 1.1.2.6
@@ -13,24 +13,20 @@
import java.io.UnsupportedEncodingException;
import java.util.Locale;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Cookie;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
+import org.apache.cocoon.environment.Response;
+
/**
* Creates a specific servlet response simulation from command line usage.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/05 22:02:03 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/03/30 17:14:27 $
*/
-public class CommandLineResponse implements HttpServletResponse {
+public class CommandLineResponse implements Response {
public PrintWriter getWriter() throws IOException {
- throw new IllegalStateException ("you are not a serializer or
reader");
- }
- public ServletOutputStream getOutputStream() throws IOException {
throw new IllegalStateException ("you are not a serializer or
reader");
}
No revision
No revision
1.1.2.22 +12 -15
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpEnvironment.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- HttpEnvironment.java 2001/02/21 12:17:13 1.1.2.21
+++ HttpEnvironment.java 2001/03/30 17:14:28 1.1.2.22
@@ -28,16 +28,14 @@
public class HttpEnvironment extends AbstractEnvironment {
- /** The HttpServletRequest */
+ /** The HttpRequest */
private HttpRequest request = null;
- private HttpServletRequest servletRequest = null;
- /** The HttpServletResponse */
+ /** The HttpResponse */
private HttpResponse response = null;
- private HttpServletResponse servletResponse = null;
- /** The ServletContext */
- private ServletContext servletContext = null;
+ /** The HttpContext */
+ private HttpContext context = null;
/** The OutputStream */
private OutputStream outputStream = null;
@@ -46,20 +44,19 @@
* Constructs a HttpEnvironment object from a HttpServletRequest
* and HttpServletResponse objects
*/
- public HttpEnvironment (String uri, HttpServletRequest request,
- HttpServletResponse response,
+ public HttpEnvironment (String uri, HttpServletRequest req,
+ HttpServletResponse res,
ServletContext servletContext)
throws MalformedURLException, IOException {
- super(uri, request.getParameter(Constants.VIEW_PARAM),
servletContext.getRealPath("/"), request.getParameter(Constants.ACTION_PARAM));
- this.request = new HttpRequest (request, this);
- this.servletRequest = request;
- this.response = new HttpResponse (response);
- this.servletResponse = response;
- this.servletContext = servletContext;
+ super(uri, req.getParameter(Constants.VIEW_PARAM),
servletContext.getRealPath("/"), req.getParameter(Constants.ACTION_PARAM));
+
+ this.request = new HttpRequest (req, this);
+ this.response = new HttpResponse (res);
+ this.context = new HttpContext (servletContext);
this.outputStream = response.getOutputStream();
this.objectModel.put(Constants.REQUEST_OBJECT, this.request);
this.objectModel.put(Constants.RESPONSE_OBJECT, this.response);
- this.objectModel.put(Constants.CONTEXT_OBJECT, this.servletContext);
+ this.objectModel.put(Constants.CONTEXT_OBJECT, this.context);
}
/**
1.1.2.6 +3 -1
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest22.java
Index: HttpRequest22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest22.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HttpRequest22.java 2001/02/27 15:57:04 1.1.2.5
+++ HttpRequest22.java 2001/03/30 17:14:29 1.1.2.6
@@ -21,13 +21,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.cocoon.environment.Request;
+
/**
*
* Implements the [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest}
interface
* to provide request information for HTTP servlets.
*/
-public class HttpRequest implements HttpServletRequest {
+public class HttpRequest implements HttpServletRequest, Request {
/** The real HttpServletRequest object */
private HttpServletRequest req = null;
1.1.2.5 +3 -1
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest23.java
Index: HttpRequest23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest23.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- HttpRequest23.java 2001/02/27 15:57:05 1.1.2.4
+++ HttpRequest23.java 2001/03/30 17:14:29 1.1.2.5
@@ -12,13 +12,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+import org.apache.cocoon.environment.Request;
+
/**
*
* Implements the [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest}
interface
* to provide request information for HTTP servlets.
*/
-public class HttpRequest extends HttpServletRequestWrapper {
+public class HttpRequest extends HttpServletRequestWrapper implements
Request {
/** The HttpEnvironment object */
private HttpEnvironment env = null;
1.1.2.3 +7 -3
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse22.java
Index: HttpResponse22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse22.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HttpResponse22.java 2000/12/18 16:55:19 1.1.2.2
+++ HttpResponse22.java 2001/03/30 17:14:29 1.1.2.3
@@ -17,6 +17,8 @@
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import org.apache.cocoon.environment.Response;
+
/**
*
* Implements the [EMAIL PROTECTED] HttpServletResponse} interface to
provide HTTP-specific
@@ -24,7 +26,7 @@
* to access HTTP headers and cookies.
*/
-public class HttpResponse implements HttpServletResponse {
+public class HttpResponse implements HttpServletResponse, Response {
/** The real HttpServletResponse object */
private HttpServletResponse res = null;
@@ -127,11 +129,13 @@
}
public ServletOutputStream getOutputStream() throws IOException {
- throw new IllegalStateException ("you are not a serializer or
reader");
+ //throw new IllegalStateException ("you are not a serializer or
reader");
+ return this.res.getOutputStream();
}
public PrintWriter getWriter() throws IOException {
- throw new IllegalStateException ("you are not a serializer or
reader");
+ //throw new IllegalStateException ("you are not a serializer or
reader");
+ return this.res.getWriter();
}
public void setContentLength(int len) {
1.1.2.2 +7 -7
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse23.java
Index: HttpResponse23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse23.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HttpResponse23.java 2000/12/05 22:02:00 1.1.2.1
+++ HttpResponse23.java 2001/03/30 17:14:29 1.1.2.2
@@ -9,15 +9,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-//import java.io.UnsupportedEncodingException;
-//import java.util.Locale;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.Cookie;
-//import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import org.apache.cocoon.environment.Response;
+
/**
*
* Implements the [EMAIL PROTECTED] HttpServletResponse} interface to
provide HTTP-specific
@@ -25,7 +23,7 @@
* to access HTTP headers and cookies.
*/
-public class HttpResponse extends HttpServletResponseWrapper {
+public class HttpResponse extends HttpServletResponseWrapper implements
Response {
/**
* Creates a HttpServletResponse based on a real HttpServletResponse
object
@@ -37,11 +35,13 @@
/* The ServletResponse interface methods */
public ServletOutputStream getOutputStream() throws IOException {
- throw new IllegalStateException ("you are not a serializer or
reader");
+ //throw new IllegalStateException ("you are not a serializer or
reader");
+ return super.getOutputStream();
}
public PrintWriter getWriter() throws IOException {
- throw new IllegalStateException ("you are not a serializer or
reader");
+ //throw new IllegalStateException ("you are not a serializer or
reader");
+ return super.getWriter();
}
}
1.1.2.3 +3 -2
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper22.java
Index: RequestWrapper22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper22.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RequestWrapper22.java 2001/03/12 05:55:21 1.1.2.2
+++ RequestWrapper22.java 2001/03/30 17:14:29 1.1.2.3
@@ -17,19 +17,20 @@
import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
+import org.apache.cocoon.environment.Request;
+
/**
*
* Implements the [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest}
interface
* to provide request information for HTTP servlets.
*/
-public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest {
+public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest, Request {
public RequestWrapper(HttpServletRequest httpservletrequest, File file,
boolean flag, boolean flag1)
throws Exception {
1.1.2.3 +3 -2
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper23.java
Index: RequestWrapper23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper23.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RequestWrapper23.java 2001/03/12 05:55:22 1.1.2.2
+++ RequestWrapper23.java 2001/03/30 17:14:29 1.1.2.3
@@ -17,19 +17,20 @@
import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
+import org.apache.cocoon.environment.Request;
+
/**
*
* Implements the [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest}
interface
* to provide request information for HTTP servlets.
*/
-public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest {
+public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest, Request {
public RequestWrapper(HttpServletRequest httpservletrequest, File file,
boolean flag, boolean flag1)
throws Exception {
No revision
No revision
1.1.2.1 +46 -0
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpContext.java
No revision
No revision
1.1.2.7 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractServerPage.java 2001/02/16 15:38:32 1.1.2.6
+++ AbstractServerPage.java 2001/03/30 17:14:32 1.1.2.7
@@ -10,7 +10,7 @@
import org.apache.cocoon.components.language.generator.CompiledComponent;
import java.io.File;
-import javax.servlet.http.HttpServletRequest;
+import org.apache.cocoon.environment.Request;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.SAXException;
@@ -20,7 +20,7 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/16 15:38:32 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/03/30 17:14:32 $
*/
public abstract class AbstractServerPage
extends ServletGenerator implements CompiledComponent
@@ -74,7 +74,7 @@
* dynamically generated content has changed
* @return Whether content has changes for this request's data
*/
- public boolean hasContentChanged(HttpServletRequest request) {
+ public boolean hasContentChanged(Request request) {
return true;
}
1.1.2.11 +3 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- RequestGenerator.java 2001/03/23 19:38:15 1.1.2.10
+++ RequestGenerator.java 2001/03/30 17:14:33 1.1.2.11
@@ -16,14 +16,14 @@
import org.apache.avalon.Poolable;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/23 19:38:15 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/30 17:14:33 $
*/
public class RequestGenerator extends ServletGenerator implements Poolable {
@@ -36,7 +36,7 @@
public void generate()
throws SAXException {
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
this.contentHandler.startDocument();
this.contentHandler.startPrefixMapping("",URI);
AttributesImpl attr=new AttributesImpl();
1.1.2.13 +10 -11
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- ServletGenerator.java 2001/03/23 13:48:53 1.1.2.12
+++ ServletGenerator.java 2001/03/30 17:14:33 1.1.2.13
@@ -10,15 +10,14 @@
import java.util.Map;
import java.io.IOException;
-import javax.servlet.ServletContext;
-
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.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.http.HttpContext;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -26,21 +25,21 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:53 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/30 17:14:33 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composer {
- protected HttpRequest request=null;
- protected HttpResponse response=null;
- protected ServletContext context=null;
+ protected Request request=null;
+ protected Response response=null;
+ protected HttpContext 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 = (HttpRequest) objectModel.get(Constants.REQUEST_OBJECT);
- this.response = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);
- this.context = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
+ this.request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ this.response = (Response) objectModel.get(Constants.RESPONSE_OBJECT);
+ this.context = (HttpContext) objectModel.get(Constants.CONTEXT_OBJECT);
}
}
No revision
No revision
1.1.2.9 +9 -9
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- DatabaseReader.java 2001/03/23 13:48:54 1.1.2.8
+++ DatabaseReader.java 2001/03/30 17:14:35 1.1.2.9
@@ -35,8 +35,8 @@
import org.xml.sax.SAXException;
-import org.apache.cocoon.environment.http.HttpRequest;
-import org.apache.cocoon.environment.http.HttpResponse;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
/**
* This Reader pulls a resource from a database. It is configured with
@@ -108,18 +108,18 @@
ResultSet set = statement.executeQuery();
if (set.next() == false) throw new
ResourceNotFoundException("There is no image with that key");
- HttpResponse res = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);
- HttpRequest req = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Response response = (Response)
objectModel.get(Constants.RESPONSE_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
- if (this.modifiedSince(set, req, res)) {
+ if (this.modifiedSince(set, request, response)) {
Blob object = set.getBlob(1);
if (object == null) {
throw new ResourceNotFoundException("There is no image
with that key");
}
-
res.setContentType(this.parameters.getParameter("content-type", ""));
- this.serialize(object, res);
+
response.setContentType(this.parameters.getParameter("content-type", ""));
+ this.serialize(object, response);
}
con.commit();
@@ -187,7 +187,7 @@
* more prone to change than filesystems, and don't have intrinsic
* timestamps on column updates.
*/
- public boolean modifiedSince(ResultSet set, HttpRequest request,
HttpResponse response)
+ public boolean modifiedSince(ResultSet set, Request request, Response
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, HttpResponse response)
+ public void serialize(Blob object, Response response)
throws IOException, SQLException {
if (object == null) {
throw new SQLException("The Blob is empty!");
1.1.2.25 +19 -20
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.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- ResourceReader.java 2001/03/23 13:48:54 1.1.2.24
+++ ResourceReader.java 2001/03/30 17:14:35 1.1.2.25
@@ -19,15 +19,14 @@
import java.util.Hashtable;
import java.util.Date;
-import javax.servlet.ServletContext;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
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.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Context;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
@@ -38,7 +37,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/23 13:48:54 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/03/30 17:14:35 $
*
* 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 +65,8 @@
* Generates the requested resource.
*/
public void generate() throws IOException, ProcessingException {
- HttpRequest req = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
- HttpResponse res = (HttpResponse)
objectModel.get(Constants.RESPONSE_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
+ Response response = (Response)
objectModel.get(Constants.RESPONSE_OBJECT);
URLFactory urlFactory = null;
try {
@@ -77,11 +76,11 @@
throw new ProcessingException ("cannot obtain the URLFactory",
e);
}
- if (res == null) {
+ if (response == null) {
throw new ProcessingException ("Missing a Response object in the
objectModel");
}
- if (req == null) {
+ if (request == null) {
throw new ProcessingException ("Missing a Request object in the
objectModel");
}
@@ -98,7 +97,7 @@
url = urlFactory.getURL (src);
conn = url.openConnection();
- if (!modified (conn.getLastModified(), req, res)) {
+ if (!modified (conn.getLastModified(), request, response)) {
return;
}
@@ -109,7 +108,7 @@
url = urlFactory.getURL (src);
file = new File (url.getFile());
- if (!modified (file.lastModified(), req, res)) {
+ if (!modified (file.lastModified(), request, response)) {
return;
}
@@ -131,17 +130,17 @@
try {
String mimeType = this.getMimeType();
if (mimeType != null) {
- res.setContentType(mimeType);
+ response.setContentType(mimeType);
}
- res.setContentLength((int) len);
+ response.setContentLength((int) len);
long expires = parameters.getParameterAsInteger("expires", -1);
if (expires > 0) {
- res.setDateHeader("Expires", new Date().getTime() + expires);
+ response.setDateHeader("Expires", new Date().getTime() +
expires);
}
- res.setHeader("Accept-Ranges", "bytes");
+ response.setHeader("Accept-Ranges", "bytes");
byte[] buffer = new byte[8192];
int length = -1;
@@ -159,12 +158,12 @@
/**
* Checks if the file has been modified
*/
- private boolean modified (long lastModified, HttpRequest req,
HttpResponse res) {
- res.setDateHeader("Last-Modified", lastModified);
- long if_modified_since = req.getDateHeader("if-modified-since");
+ private boolean modified (long lastModified, Request request, Response
response) {
+ response.setDateHeader("Last-Modified", lastModified);
+ long if_modified_since = request.getDateHeader("if-modified-since");
if (if_modified_since >= lastModified) {
- res.setStatus(HttpResponse.SC_NOT_MODIFIED);
+
response.setStatus(org.apache.cocoon.environment.http.HttpResponse.SC_NOT_MODIFIED);
}
getLogger().debug("ResourceReader: resource has " +
((if_modified_since < lastModified) ? "" : "not ") + "been modified");
@@ -175,7 +174,7 @@
* Returns the mime-type of the resource in process.
*/
public String getMimeType () {
- ServletContext ctx = (ServletContext)
objectModel.get(Constants.CONTEXT_OBJECT);
+ Context ctx = (Context) objectModel.get(Constants.CONTEXT_OBJECT);
if (ctx != null) {
return ctx.getMimeType(this.source);
No revision
No revision
1.1.2.5 +10 -11
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- CodedSelectorHelper.java 2001/03/23 13:48:55 1.1.2.4
+++ CodedSelectorHelper.java 2001/03/30 17:14:37 1.1.2.5
@@ -11,12 +11,11 @@
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletConfig;
import javax.servlet.http.HttpSession;
-import org.apache.cocoon.environment.http.HttpRequest;
-import org.apache.cocoon.environment.http.HttpResponse;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Context;
/**
* This abstract class provides the basis for testing the environment with
@@ -25,7 +24,7 @@
* variables for developer ease.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/03/23 13:48:55 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/03/30 17:14:37 $
*/
public abstract class CodedSelectorHelper
{
@@ -35,17 +34,17 @@
protected void initialize(Map objectModel)
{
- context = (ServletContext)
+ context = (Context)
objectModel.get(Constants.CONTEXT_OBJECT);
- request = (HttpRequest)
+ request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
- response = (HttpResponse)
+ response = (Response)
objectModel.get(Constants.RESPONSE_OBJECT);
session = request.getSession(false);
}
- protected ServletContext context;
- protected HttpRequest request;
- protected HttpResponse response;
+ protected Context context;
+ protected Request request;
+ protected Response response;
protected HttpSession session;
}
No revision
No revision
1.1.2.15 +1 -3
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java
Index: LinkTranslator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/LinkTranslator.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- LinkTranslator.java 2001/03/19 21:20:39 1.1.2.14
+++ LinkTranslator.java 2001/03/30 17:14:38 1.1.2.15
@@ -13,8 +13,6 @@
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
@@ -29,7 +27,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/03/19 21:20:39 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/30 17:14:38 $
*/
public class LinkTranslator extends ExtendedXLinkPipe implements Transformer
{
No revision
No revision
1.1.2.13 +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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- TraxTransformer.java 2001/03/23 13:48:56 1.1.2.12
+++ TraxTransformer.java 2001/03/30 17:14:40 1.1.2.13
@@ -17,7 +17,7 @@
import java.lang.reflect.Method;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.avalon.Component;
import org.apache.avalon.configuration.ConfigurationException;
@@ -58,7 +58,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/23 13:48:56 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/30 17:14:40 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable, Recyclable, Configurable {
@@ -161,7 +161,7 @@
throws SAXException, ProcessingException, IOException {
/** The Request object */
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
// Check the stylesheet uri
String xsluri = src;
1.1.2.18 +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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- XTTransformer.java 2001/03/23 13:48:56 1.1.2.17
+++ XTTransformer.java 2001/03/30 17:14:40 1.1.2.18
@@ -14,7 +14,7 @@
import java.util.Map;
import java.util.HashMap;
-import org.apache.cocoon.environment.http.HttpRequest;
+import org.apache.cocoon.environment.Request;
import org.apache.log.Logger;
import org.apache.avalon.Loggable;
@@ -71,7 +71,7 @@
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/03/23 13:48:56 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/03/30 17:14:40 $
*/
public class XTTransformer extends DocumentHandlerWrapper
implements Transformer, Composer, Loggable, Poolable {
@@ -119,7 +119,7 @@
throws SAXException, ProcessingException, IOException {
/** The Request object */
- HttpRequest request = (HttpRequest)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
if (request == null) {
throw new ProcessingException ("Missing request object in
objectModel");
}
No revision
No revision
1.1.2.12 +1 -3
xml-cocoon/src/org/apache/cocoon/util/Attic/ClassUtils.java
Index: ClassUtils.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ClassUtils.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ClassUtils.java 2001/02/14 11:39:56 1.1.2.11
+++ ClassUtils.java 2001/03/30 17:14:41 1.1.2.12
@@ -14,14 +14,12 @@
import java.io.IOException;
-import javax.servlet.ServletContext;
-
/**
* A collection of class management utility methods.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/14 11:39:56 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/30 17:14:41 $
*/
public class ClassUtils {
No revision
No revision
1.1.2.3 +5 -5
xml-cocoon/src/org/apache/cocoon/util/url/context/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/url/context/Attic/Handler.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Handler.java 2001/03/12 05:55:25 1.1.2.2
+++ Handler.java 2001/03/30 17:14:43 1.1.2.3
@@ -13,24 +13,24 @@
import java.net.URLStreamHandler;
import java.io.IOException;
import java.io.FileNotFoundException;
-import javax.servlet.ServletContext;
+import org.apache.cocoon.environment.Context;
/**
* This class implements the handler for the context: URL
*
* @author: <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @author: <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/12 05:55:25 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/03/30 17:14:43 $
*/
public class Handler extends URLStreamHandler {
- /** The ServletContext */
- private static ServletContext context;
+ /** The Context */
+ private static Context context;
/**
* Sets the ServletContext to pull files from
*/
- public static void setContext(ServletContext context) {
+ public static void setContext(Context context) {
if (Handler.context == null) {
Handler.context = context;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
