cziegeler 01/04/19 06:11:50
Modified: . Tag: xml-cocoon2 build.xml todo.xml
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPResponseHelper.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 response.xsl
src/org/apache/cocoon/components/pipeline Tag: xml-cocoon2
CachingStreamPipeline.java
Added: src/org/apache/cocoon/environment/http Tag: xml-cocoon2
HttpRequest.java HttpResponse.java
Removed: src/org/apache/cocoon/environment/http Tag: xml-cocoon2
HttpRequest22.java HttpRequest23.java
HttpResponse22.java HttpResponse23.java
Log:
Removed workarounds and finished todos
Revision Changes Path
No revision
No revision
1.6.2.79 +0 -14 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.78
retrieving revision 1.6.2.79
diff -u -r1.6.2.78 -r1.6.2.79
--- build.xml 2001/04/19 09:59:51 1.6.2.78
+++ build.xml 2001/04/19 13:11:39 1.6.2.79
@@ -236,9 +236,7 @@
<mkdir dir="${build.dest}"/>
<copy todir="${build.src}" filtering="on">
<fileset dir="${src.dir}">
- <exclude name="**/http/HttpRequest2*.java"/>
<exclude name="**/http/RequestWrapper2*.java"/>
- <exclude name="**/http/HttpResponse2*.java"/>
<exclude name="**/Ora*.java" unless="ora.driver.present"/>
<exclude name="**/Sendmail*.java" unless="mail.present"/>
<exclude name="**/browser/*.x*"/>
@@ -250,29 +248,17 @@
<!-- Prepares the servlet 2.3 source code
-->
<!-- ===================================================================
-->
<target name="prepare-src-23" depends="prepare-src-main"
if="servlet23.present">
- <copy
file="${src.dir}/org/apache/cocoon/environment/http/HttpRequest22.java"
-
tofile="${build.src}/org/apache/cocoon/environment/http/HttpRequest.java"
- filtering="on"/>
<copy
file="${src.dir}/org/apache/cocoon/environment/http/RequestWrapper23.java"
tofile="${build.src}/org/apache/cocoon/environment/http/RequestWrapper.java"
filtering="on"/>
- <copy
file="${src.dir}/org/apache/cocoon/environment/http/HttpResponse22.java"
-
tofile="${build.src}/org/apache/cocoon/environment/http/HttpResponse.java"
- filtering="on"/>
</target>
<!-- ===================================================================
-->
<!-- Prepares the servlet 2.2 source code
-->
<!-- ===================================================================
-->
<target name="prepare-src-22" depends="prepare-src-23"
unless="servlet23.present">
- <copy
file="${src.dir}/org/apache/cocoon/environment/http/HttpRequest22.java"
-
tofile="${build.src}/org/apache/cocoon/environment/http/HttpRequest.java"
- filtering="on"/>
<copy
file="${src.dir}/org/apache/cocoon/environment/http/RequestWrapper22.java"
tofile="${build.src}/org/apache/cocoon/environment/http/RequestWrapper.java"
- filtering="on"/>
- <copy
file="${src.dir}/org/apache/cocoon/environment/http/HttpResponse22.java"
-
tofile="${build.src}/org/apache/cocoon/environment/http/HttpResponse.java"
filtering="on"/>
</target>
1.6.2.30 +3 -12 xml-cocoon/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/todo.xml,v
retrieving revision 1.6.2.29
retrieving revision 1.6.2.30
diff -u -r1.6.2.29 -r1.6.2.30
--- todo.xml 2001/04/19 06:48:20 1.6.2.29
+++ todo.xml 2001/04/19 13:11:39 1.6.2.30
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: todo.xml,v 1.6.2.29 2001/04/19 06:48:20 cziegeler Exp $
+ $Id: todo.xml,v 1.6.2.30 2001/04/19 13:11:39 cziegeler Exp $
-->
@@ -27,9 +27,8 @@
</devs>
<actions priority="high">
- <action context="code" assigned-to="CZ">
- Cleaning up the environment object like Request, Response for the
- different environments.
+ <action context="code" assigned-to="open">
+ Remove dependencies to the javax.servlet classes.
</action>
<action context="code" assigned-to="open">
@@ -63,14 +62,6 @@
<action context="code" assigned-to="PR">
Implement transparent content aggregation at the pipeline level.
- </action>
-
- <action context="code" assigned-to="CZ">
- Finish caching of intermediate SAX events between sitemap pipeline
components.
- </action>
-
- <action context="code" assigned-to="CZ">
- Finish caching of StreamPipelines.
</action>
</actions>
No revision
No revision
1.1.2.13 +1 -26
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XSPResponseHelper.java 2001/04/18 12:05:49 1.1.2.12
+++ XSPResponseHelper.java 2001/04/19 13:11:41 1.1.2.13
@@ -25,7 +25,7 @@
* The XSP <code>Response</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/18 12:05:49 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/19 13:11:41 $
*/
public class XSPResponseHelper extends XSPObjectHelper {
/**
@@ -64,31 +64,6 @@
response.addHeader(name, value);
}
- /**
- * Set the content type for a given response
- *
- * @param objectModel The Map objectModel
- * @param type The content type
- */
-/* public static void setContentType(Map objectModel, String type) {
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
- response.setContentType(type);
- }
-*/
- /**
- * Send an HTTP redirect
- *
- * @param objectModel The Map objectModel
- * @param location The location URL
- */
-/* public static void sendRedirect(Map objectModel, String location) {
- try {
- Response response =
(Response)objectModel.get(Constants.RESPONSE_OBJECT);
- response.sendRedirect(response.encodeRedirectURL(location));
- }
- catch (IOException e)
{LogKit.getLoggerFor("cocoon").warn("XSPResponseHelper.sendRedirect", e);}
- }
-*/
/**
* Encode the URL
*
No revision
No revision
1.1.2.12 +1 -34
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl
Index: response.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/response.xsl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- response.xsl 2001/04/18 12:05:51 1.1.2.11
+++ response.xsl 2001/04/19 13:11:43 1.1.2.12
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/04/18 12:05:51 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/19 13:11:43 $
-->
<!-- XSP Response logicsheet for the Java language -->
@@ -50,40 +50,7 @@
XSPResponseHelper.setHeader(objectModel, <xsl:value-of
select="$name"/>, <xsl:value-of select="$value"/>);
</xsp:logic>
</xsl:template>
-<!--
- <xsl:template match="xsp-response:set-content-type">
- <xsl:variable name="type">
- <xsl:choose>
- <xsl:when test="@type">"<xsl:value-of select="@type"/>"</xsl:when>
- <xsl:when test="xsp-response:type">
- <xsl:call-template name="get-nested-content">
- <xsl:with-param name="content" select="xsp-response:type"/>
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
- </xsl:variable>
-
- <xsp:logic>
- XSPResponseHelper.setContentType(objectModel, <xsl:value-of
select="$type"/>);
- </xsp:logic>
- </xsl:template>
- <xsl:template match="xsp-response:send-redirect">
- <xsl:variable name="location">
- <xsl:choose>
- <xsl:when test="@location">"<xsl:value-of
select="@location"/>"</xsl:when>
- <xsl:when test="xsp-response:location">
- <xsl:call-template name="get-nested-content">
- <xsl:with-param name="content" select="xsp-response:location"/>
- </xsl:call-template>
- </xsl:when>
- </xsl:choose>
- </xsl:variable>
- <xsp:logic>
- XSPResponseHelper.sendRedirect(objectModel, <xsl:value-of
select="$location"/>);
- </xsp:logic>
- </xsl:template>
--->
<xsl:template name="get-nested-content">
<xsl:param name="content"/>
<xsl:choose>
No revision
No revision
1.1.2.4 +3 -2
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CachingStreamPipeline.java 2001/04/18 16:56:49 1.1.2.3
+++ CachingStreamPipeline.java 2001/04/19 13:11:44 1.1.2.4
@@ -46,7 +46,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/18 16:56:49 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/19 13:11:44 $
*/
public final class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -324,7 +324,8 @@
getLogger().debug("Recycling of CachingStreamPipeline");
super.recycle();
- //this.serializerRole = null;
+ this.serializerRole = null;
+ this.readerRole = null;
}
}
No revision
No revision
1.1.2.9 +69 -43
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest.java
1.1.2.9 +28 -13
xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpResponse.java
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
