You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/03/17 15:21:37 UTC
svn commit: r637895 - in
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main:
java/org/apache/cocoon/servletservice/demo1/DemoServlet.java
resources/COB-INF/overview/overview.html
Author: reinhard
Date: Mon Mar 17 07:21:34 2008
New Revision: 637895
URL: http://svn.apache.org/viewvc?rev=637895&view=rev
Log:
after overview.html was mounted to a different path, fix all links
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/java/org/apache/cocoon/servletservice/demo1/DemoServlet.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/resources/COB-INF/overview/overview.html
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/java/org/apache/cocoon/servletservice/demo1/DemoServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/java/org/apache/cocoon/servletservice/demo1/DemoServlet.java?rev=637895&r1=637894&r2=637895&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/java/org/apache/cocoon/servletservice/demo1/DemoServlet.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/java/org/apache/cocoon/servletservice/demo1/DemoServlet.java Mon Mar 17 07:21:34 2008
@@ -149,11 +149,11 @@
os.close();
} else if ("/test9".equals(path)) {
- // FIXME Doesn't work currently!
RelativeServletConnection con = new RelativeServletConnection(null, "/test8", null);
response.setContentType("text/plain");
InputStream is = con.getInputStream();
OutputStream os = response.getOutputStream();
+ response.setStatus(con.getResponseCode());
copy(is, os);
is.close();
os.close();
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/resources/COB-INF/overview/overview.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/resources/COB-INF/overview/overview.html?rev=637895&r1=637894&r2=637895&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/resources/COB-INF/overview/overview.html (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/src/main/resources/COB-INF/overview/overview.html Mon Mar 17 07:21:34 2008
@@ -25,42 +25,43 @@
<h2>Usage in sitemaps</h2>
<ul>
- <li><a href="cocoon-servlet-service-sample1/test">Simple pipeline</a>: A simple pipeline that doesn't use the SSF./</li>
- <li><a href="cocoon-servlet-service-sample1/test2">servlet: protocol usage</a>: Calling another pipeline using the servlet: protocol./</li>
- <li><a href="cocoon-servlet-service-sample1/test3">servlet: protocol usage (self-referencing)</a>:
- Calling another pipeline from within the same sitemap (servlet-service) using the servlet: protocol./</li>
- <li><a href="cocoon-servlet-service-sample1/test4">Reading a resource</a>: A simple pipeline that reads a resource using the resource: protocol./</li>
- <li><a href="cocoon-servlet-service-sample1/test5">Servlet-Service generator</a>: Using the servlet-service generator that
- performs a POST request on a generating servlet-service and passes the result to the calling pipeline./</li> ,
- <li><a href="cocoon-servlet-service-sample1/test6">Servlet-Service transformer</a>: Using the servlet-service transformer that
- performs a POST request on a transforming servlet-service and passes the transformed result to the calling pipeline./</li>
- <li><a href="cocoon-servlet-service-sample1/test7">Servlet-Service serializer</a>: Using the servlet-service serializer that
- performs a POST request on a serializing servlet-service./</li>
+ <li><a href="../cocoon-servlet-service-sample1/test">Simple pipeline</a>: A simple pipeline that doesn't use the SSF.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test2">servlet: protocol usage</a>: Calling another pipeline using the servlet: protocol.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test3">servlet: protocol usage (self-referencing)</a>:
+ Calling another pipeline from within the same sitemap (servlet-service) using the servlet: protocol.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test4">Reading a resource</a>: A simple pipeline that reads a resource using the resource: protocol.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test5">Servlet-Service generator</a>: Using the servlet-service generator that
+ performs a POST request on a generating servlet-service and passes the result to the calling pipeline.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test6">Servlet-Service transformer</a>: Using the servlet-service transformer that
+ performs a POST request on a transforming servlet-service and passes the transformed result to the calling pipeline.</li>
+ <li><a href="../cocoon-servlet-service-sample1/test7">Servlet-Service serializer</a>: Using the servlet-service serializer that
+ performs a POST request on a serializing servlet-service.</li>
</ul>
<h2>Sub-Sitemaps</h2>
<ul>
- <li><a href="cocoon-servlet-service-sample1/sub/test">Simple pipeline</a>: A simple pipeline that doesn't use the SSF./</li>
- <li><a href="cocoon-servlet-service-sample1/sub/test3">Servlet: protocol</a>: Use the servlet: protocol from a sub sitemap./</li>
+ <li><a href="../cocoon-servlet-service-sample1/sub/test">Simple pipeline</a>: A simple pipeline that doesn't use the SSF./</li>
+ <li><a href="../cocoon-servlet-service-sample1/sub/test3">Servlet: protocol</a>: Use the servlet: protocol from a sub sitemap./</li>
</ul>
<h2>Block-Path module</h2>
<ul>
- <li><a href="cocoon-servlet-service-sample1/sub/abs">Block-path module</a>: Use the block-path module to find the mount-path of a servlet-service./</li>
+ <li><a href="../cocoon-servlet-service-sample1/sub/abs">Block-path module</a>: Use the block-path module to find the mount-path of a servlet-service./</li>
</ul>
<h2>Passing information of origal request</h2>
<ul>
- <li><a href="test1/test4?foo=5">Passing original request</a>: The request attributes, parameters and header parameters are shared between the calling
+ <li><a href="../test1/test4?foo=5">Passing original request</a>: The request attributes, parameters and header parameters are shared between the calling
and the called request. The called request has its own session but can also access the global session.</li>
</ul>
<h2>Servlet-Connections</h2>
<ul>
- <li><a href="test1/test2">Request Dispatcher</a>: Use the RequestDispatcher to access another servlet-service.</li>
- <li><a href="test1/test3">Source Resolver</a>: Use the SourceResolver access another servlet-service.</li>
- <li><a href="test1/test5">Relative servlet connection</a>: Use the RelativeServletConnection object to access another servlet-service.</li>
- <li><a href="test1/test6">Relative servlet connection</a>: Use the RelativeServletConnection object to access a resource provided by the same servlet-service.</li>
+ <li><a href="../test1/test2">Request Dispatcher</a>: Use the RequestDispatcher to access another servlet-service.</li>
+ <li><a href="../test1/test3">Source Resolver</a>: Use the SourceResolver access another servlet-service.</li>
+ <li><a href="../test1/test5">Relative servlet connection</a>: Use the RelativeServletConnection object to access another servlet-service.</li>
+ <li><a href="../test1/test6">Relative servlet connection</a>: Use the RelativeServletConnection object to access a resource provided by the same servlet-service.</li>
+ <li><a href="../test1/test9">Relative servlet connection</a>: Use the RelativeServletConnection object to access a resource provided by the same servlet-service and that returns an error status code.</li>
</ul>
</body>