You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@locus.apache.org on 2000/09/25 16:58:28 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/serialization FOPSerializer.java HTMLSerializer.java SVGSerializer.java TextSerializer.java XLinkSerializer.java XMLSerializer.java
stefano 00/09/25 07:58:26
Modified: src/org/apache/cocoon/serialization Tag: xml-cocoon2
FOPSerializer.java HTMLSerializer.java
SVGSerializer.java TextSerializer.java
XLinkSerializer.java XMLSerializer.java
Log:
supporting new bridge status
Revision Changes Path
No revision
No revision
1.1.2.5 +2 -2 xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FOPSerializer.java 2000/09/15 16:11:38 1.1.2.4
+++ FOPSerializer.java 2000/09/25 14:57:23 1.1.2.5
@@ -31,7 +31,7 @@
* @author <a href="mailto:giacomo.pati@pwr.ch">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/09/15 16:11:38 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/09/25 14:57:23 $
*
*/
public class FOPSerializer extends XMLConsumerBridge implements Serializer, MessageListener {
@@ -65,7 +65,7 @@
*/
public void setOutputStream(OutputStream out) {
this.driver.setWriter(new PrintWriter(out));
- this.setBridgedContentHandler(this.driver.getContentHandler());
+ this.setContentHandler(this.driver.getContentHandler());
}
/**
1.1.2.7 +2 -2 xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- HTMLSerializer.java 2000/08/23 22:43:37 1.1.2.6
+++ HTMLSerializer.java 2000/09/25 14:58:11 1.1.2.7
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/23 22:43:37 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/25 14:58:11 $
*/
public class HTMLSerializer extends AbstractSerializer {
@@ -33,7 +33,7 @@
public void setOutputStream(OutputStream out) {
try {
super.setOutputStream(out);
- this.setBridgedContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
+ this.setContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
} catch (Exception e) {
throw new RuntimeException(e.toString());
}
1.1.2.10 +7 -7 xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- SVGSerializer.java 2000/09/05 17:27:28 1.1.2.9
+++ SVGSerializer.java 2000/09/25 14:58:13 1.1.2.10
@@ -1,10 +1,10 @@
-/*****************************************************************************
- * Copyright (C) 1999 The Apache Software Foundation. All rights reserved. *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of wich has been included with this distribution in *
- * the LICENSE file. *
- *****************************************************************************/
+/***************************************************************************** *
+Copyright (C) 1999 The Apache Software Foundation. All rights reserved. * * ---
+---------------------------------------------------------------------- * * This
+software is published under the terms of the Apache Software License * * version
+1.1, a copy of wich has been included with this distribution in * * the
+LICENSE file. *
+*****************************************************************************/
package org.apache.cocoon.serialization;
import org.apache.cocoon.*;
1.1.2.3 +2 -2 xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextSerializer.java 2000/08/23 22:43:37 1.1.2.2
+++ TextSerializer.java 2000/09/25 14:58:15 1.1.2.3
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/08/23 22:43:37 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/09/25 14:58:15 $
*/
public class TextSerializer extends AbstractSerializer {
@@ -33,7 +33,7 @@
public void setOutputStream(OutputStream out) {
try {
super.setOutputStream(out);
- this.setBridgedContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
+ this.setContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
} catch (Exception e) {
throw new RuntimeException(e.toString());
}
1.1.2.2 +14 -8 xml-cocoon/src/org/apache/cocoon/serialization/Attic/XLinkSerializer.java
Index: XLinkSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XLinkSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XLinkSerializer.java 2000/09/05 17:27:29 1.1.2.1
+++ XLinkSerializer.java 2000/09/25 14:58:16 1.1.2.2
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/09/05 17:27:29 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/09/25 14:58:16 $
*/
public class XLinkSerializer extends XLinkConsumerBridge implements Serializer {
@@ -44,17 +44,23 @@
// XLinkHandler implementation
- public void simpleLink(String href, String role, String arcrole, String title, String show, String actuate)
+ public void simpleLink(String href, String role, String arcrole, String title, String show, String actuate, String uri, String name, String raw)
throws SAXException {
- if (Cocoon.LINK_CRAWLING_ROLE.equals(role)) {
- this.out.println(href);
- }
+ encode(href, role, out);
}
- public void startLocator(String href, String role, String title, String label)
+ public void startLocator(String href, String role, String title, String label, String uri, String name, String raw)
throws SAXException {
- if (Cocoon.LINK_CRAWLING_ROLE.equals(role)) {
- this.out.println(href);
+ encode(href, role, out);
+ }
+
+ private void encode(String href, String role, PrintStream out) {
+ if ((role == null) || role.equals(Cocoon.LINK_CRAWLING_ROLE)) {
+ out.print('+');
+ } else {
+ out.print('-');
}
+ out.print(" ");
+ out.println(href);
}
}
1.1.2.7 +2 -2 xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XMLSerializer.java 2000/08/23 22:43:37 1.1.2.6
+++ XMLSerializer.java 2000/09/25 14:58:17 1.1.2.7
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/23 22:43:37 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/25 14:58:17 $
*/
public class XMLSerializer extends AbstractSerializer {
@@ -33,7 +33,7 @@
public void setOutputStream(OutputStream out) {
try {
super.setOutputStream(out);
- this.setBridgedContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
+ this.setContentHandler(this.factory.makeSerializer(out, this.format).asContentHandler());
} catch (Exception e) {
throw new RuntimeException(e.toString());
}