cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r563616 - in /cocoon/trunk/blocks: cocoon-portal/cocoon-portal-impl/ cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/ cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/...
Date Tue, 07 Aug 2007 18:41:22 GMT
Author: cziegeler
Date: Tue Aug  7 11:41:20 2007
New Revision: 563616

URL: http://svn.apache.org/viewvc?view=rev&rev=563616
Log:
Add missing interfaces and use new serializer in portal servlet.

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/PortalServlet.java
    cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/serializers/util/EncodingSerializer.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?view=diff&rev=563616&r1=563615&r2=563616
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Tue Aug  7 11:41:20 2007
@@ -96,6 +96,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-serializers-charset</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/PortalServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/PortalServlet.java?view=diff&rev=563616&r1=563615&r2=563616
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/PortalServlet.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/servlet/PortalServlet.java
Tue Aug  7 11:41:20 2007
@@ -23,15 +23,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.cocoon.components.serializers.util.EncodingSerializer;
+import org.apache.cocoon.components.serializers.util.XHTMLSerializer;
 import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.services.PortalManager;
 import org.springframework.web.HttpRequestHandler;
-import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
 /**
- * 
+ *
  * @version $Id$
  */
 public class PortalServlet implements HttpRequestHandler {
@@ -59,8 +60,9 @@
         try {
             pm.process();
             // TODO - what do we here? We don't have an xml consumer
-            final ContentHandler xmlConsumer = null;
-            pm.render(xmlConsumer, this.properties);
+            // create serializer
+            EncodingSerializer serializer = new XHTMLSerializer();
+            pm.render(serializer, this.properties);
         } catch (SAXException se) {
             throw new ServletException(se);
         } catch (PortalException pe) {

Modified: cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/serializers/util/EncodingSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/serializers/util/EncodingSerializer.java?view=diff&rev=563616&r1=563615&r2=563616
==============================================================================
--- cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/serializers/util/EncodingSerializer.java
(original)
+++ cocoon/trunk/blocks/cocoon-serializers/cocoon-serializers-charsets/src/main/java/org/apache/cocoon/components/serializers/util/EncodingSerializer.java
Tue Aug  7 11:41:20 2007
@@ -34,6 +34,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.AttributesImpl;
 
 /**
@@ -44,7 +45,7 @@
  *
  * @version $Id$
  */
-public abstract class EncodingSerializer implements Locator  {
+public abstract class EncodingSerializer implements ContentHandler, LexicalHandler, Locator
 {
 
     /** The line separator string */
     private static final char S_EOL[] = SystemUtils.LINE_SEPARATOR.toCharArray();



Mime
View raw message