You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@apache.org on 2001/01/04 23:39:39 UTC
cvs commit: xml-cocoon/xdocs docs-book.xml httprequest.xml site-book.xml sitemap.xml svg-serializer.xml
dims 01/01/04 14:39:39
Modified: . Tag: xml-cocoon2 changes.xml todo.xml
src/org/apache/cocoon/serialization Tag: xml-cocoon2
SVGSerializer.java
src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
SVGBuilder.java
webapp Tag: xml-cocoon2 cocoon.xconf sitemap.xmap
xdocs Tag: xml-cocoon2 docs-book.xml httprequest.xml
site-book.xml sitemap.xml svg-serializer.xml
Removed: src/org/apache/cocoon/components/image Tag: xml-cocoon2
ImageEncoder.java JAIJPEGEncoder.java
JAIPNGEncoder.java JPEGEncoder.java PNGEncoder.java
Log:
Cleaning up for SVG Serializer - Removing Image Encoders.
Revision Changes Path
No revision
No revision
1.9.2.18 +5 -1 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -r1.9.2.17 -r1.9.2.18
--- changes.xml 2000/12/22 20:04:29 1.9.2.17
+++ changes.xml 2001/01/04 22:39:20 1.9.2.18
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.9.2.17 2000/12/22 20:04:29 bloritsch Exp $
+ $Id: changes.xml,v 1.9.2.18 2001/01/04 22:39:20 dims Exp $
-->
<changes title="History of Changes">
@@ -18,9 +18,13 @@
<person name="Stefano Mazzocchi" email="stefano@apache.org" id="SM"/>
<person name="Giacomo Pati" email="Giacomo.Pati@pwr.ch" id="GP"/>
<person name="Ricardo Rocha" email="ricardo@apache.org" id="RR"/>
+ <person name="Davanum Srinivas" email="dims@yahoo.com" id="DM"/>
</devs>
<release version="@version@" date="@date@">
+ <action dev="RB" type="add">
+ SVG serializer now uses Batik.
+ </action>
<action dev="BL" type="add">
I did a first stab at importing the util logicsheet from Cocoon 1.8.x.
</action>
1.6.2.15 +1 -4 xml-cocoon/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/todo.xml,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -r1.6.2.14 -r1.6.2.15
--- todo.xml 2000/12/22 20:04:29 1.6.2.14
+++ todo.xml 2001/01/04 22:39:21 1.6.2.15
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: todo.xml,v 1.6.2.14 2000/12/22 20:04:29 bloritsch Exp $
+ $Id: todo.xml,v 1.6.2.15 2001/01/04 22:39:21 dims Exp $
-->
@@ -54,9 +54,6 @@
for SAX2 final.
</action>
- <action context="code">
- Finish writing SVGSerializer.
- </action>
</actions>
<actions priority="medium">
No revision
No revision
1.1.2.20 +6 -0 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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- SVGSerializer.java 2001/01/04 16:03:05 1.1.2.19
+++ SVGSerializer.java 2001/01/04 22:39:27 1.1.2.20
@@ -32,6 +32,12 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+/**
+ * A Batik based Serializer for generating PNG/JPG images
+ *
+ * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/01/04 22:39:27 $
+ */
public class SVGSerializer extends SVGBuilder implements Composer, Serializer, Configurable {
/** The <code>ContentHandler</code> receiving SAX events. */
No revision
No revision
1.1.2.2 +4 -5 xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SVGBuilder.java 2001/01/04 16:03:09 1.1.2.1
+++ SVGBuilder.java 2001/01/04 22:39:29 1.1.2.2
@@ -38,12 +38,11 @@
import org.apache.batik.css.CSSDocumentHandler;
/**
- * The <code>SVGBuilder</code> is a utility class that will generate a W3C
- * DOM Document from SAX events.
+ * The <code>SVGBuilder</code> is a utility class that will generate a
+ * SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
*
- * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
- * (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/01/04 16:03:09 $
+ * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/04 22:39:29 $
*/
public class SVGBuilder extends SVGDocumentFactory implements XMLConsumer {
protected Logger log = LogKit.getLoggerFor("cocoon");
No revision
No revision
1.1.2.10 +0 -6 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- cocoon.xconf 2000/11/13 18:14:53 1.1.2.9
+++ cocoon.xconf 2001/01/04 22:39:31 1.1.2.10
@@ -64,12 +64,6 @@
<parameter name="auto-reload" value="true"/>
</component>
- <!-- these components are the image encoders for the SVG serializer -->
- <component role="org.apache.cocoon.components.image.ImageEncoderSelector" class="org.apache.cocoon.CocoonComponentSelector">
- <component-instance name="jpegencoder" class="org.apache.cocoon.components.image.JPEGEncoder"/>
- <!--<component-instance name="pngencoder" class="org.apache.cocoon.components.image.PNGEncoder"/>-->
- </component>
-
<!-- these components is used as a PoolController for the sitemap component pools -->
<component role="org.apache.avalon.util.pool.PoolController" class="org.apache.cocoon.util.ComponentPoolController"/>
1.1.2.31 +1 -1 xml-cocoon/webapp/Attic/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/sitemap.xmap,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- sitemap.xmap 2001/01/03 13:49:00 1.1.2.30
+++ sitemap.xmap 2001/01/04 22:39:32 1.1.2.31
@@ -44,7 +44,7 @@
</map:serializer>
<map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
</map:serializer>
- <map:serializer name="svg2png" mime-type="image/png" src="org.apache.cocoon.serialization.SVGSerializer">
+ <map:serializer name="svg2png" mime-type="image/png" src="org.apache.cocoon.serialization.SVGSerializer">
</map:serializer>
</map:serializers>
No revision
No revision
1.4.2.10 +0 -1 xml-cocoon/xdocs/docs-book.xml
Index: docs-book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/docs-book.xml,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -r1.4.2.9 -r1.4.2.10
--- docs-book.xml 2000/11/20 11:55:00 1.4.2.9
+++ docs-book.xml 2001/01/04 22:39:34 1.4.2.10
@@ -17,7 +17,6 @@
<separator/>
<page id="sitemap" label="Sitemap" source="sitemap.xml"/>
<page id="svg" label="SVG Serializer" source="svg-serializer.xml"/>
- <page id="imageencoder" label="Image Encoders" source="image-encoders.xml"/>
<separator/>
<faqs id="faqs" label="FAQ File" source="faq.xml" />
<changes id="changes" label="Changes" source="changes.xml"/>
1.1.2.2 +0 -7 xml-cocoon/xdocs/Attic/httprequest.xml
Index: httprequest.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/httprequest.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- httprequest.xml 2000/11/20 11:56:07 1.1.2.1
+++ httprequest.xml 2001/01/04 22:39:34 1.1.2.2
@@ -165,13 +165,6 @@
<parameter name="auto-reload" value="true"/>
</component>
- <!-- these components are the image encoders for the SVG serializer -->
- <component role="org.apache.cocoon.components.image.ImageEncoderSelector"
- class="org.apache.cocoon.CocoonComponentSelector">
- <component-instance name="jpegencoder" class="org.apache.cocoon.components.image.JPEGEncoder"/>
- <!--<component-instance name="pngencoder" class="org.apache.cocoon.components.image.PNGEncoder"/>-->
- </component>
-
<!-- these components is used as a PoolController for the sitemap component pools -->
<component role="org.apache.avalon.util.pool.PoolController"
class="org.apache.cocoon.util.ComponentPoolController"/>
1.4.2.5 +0 -1 xml-cocoon/xdocs/site-book.xml
Index: site-book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/site-book.xml,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- site-book.xml 2000/10/28 10:19:31 1.4.2.4
+++ site-book.xml 2001/01/04 22:39:35 1.4.2.5
@@ -13,7 +13,6 @@
<page id="logicsheet-concepts" label="XSP Logicsheets" source="logicsheet-concepts.xml"/>
<page id="sitemap" label="Sitemap" source="sitemap.xml"/>
<page id="svg" label="SVG Serializer" source="svg-serializer.xml"/>
- <page id="imageencoder" label="Image Encoders" source="image-encoders.xml"/>
<separator/>
<faqs id="faqs" label="FAQ File" source="faq.xml" />
<changes id="changes" label="Changes" source="changes.xml"/>
1.1.2.6 +1 -5 xml-cocoon/xdocs/Attic/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/sitemap.xml,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- sitemap.xml 2000/10/28 10:19:32 1.1.2.5
+++ sitemap.xml 2001/01/04 22:39:35 1.1.2.6
@@ -263,16 +263,12 @@
<encoding>UTF-8</encoding>
</map:serializer>
- <map:serializer type="svg2jpg" mime-type="image/jpg"
+ <map:serializer type="svg2jpeg" mime-type="image/jpeg"
src="class:///org.apache.cocoon.serializer.SVGSerializer">
- <format value="jpg"/>
- <compression-level>80%</compression-level>
</map:serializer>
<map:serializer type="svg2png" mime-type="image/png"
src="class:///org.apache.cocoon.serializer.SVGSerializer">
- <format>png</format>
- <color-depth value="24"/>
</map:serializer>
</map:serializers>
]]>
1.1.2.2 +1 -6 xml-cocoon/xdocs/Attic/svg-serializer.xml
Index: svg-serializer.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/svg-serializer.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- svg-serializer.xml 2000/10/04 20:52:38 1.1.2.1
+++ svg-serializer.xml 2001/01/04 22:39:36 1.1.2.2
@@ -21,8 +21,7 @@
<p>So how does this serializer work?</p>
<ol>
<li>Parse and validate SVG document</li>
- <li>Render the SVG to a <code>BufferedImage</code></li>
- <li>Call an <code>ImageEncoder</code> (see Image Encoders) to encode this image as an image file, and return it to the user.</li>
+ <li>Call Batik's <code>Transcoder</code> to encode this image as an image file, and return it to the user.</li>
</ol>
</s2>
@@ -35,7 +34,6 @@
<!-- this line goes inside the map:serializers tag -->
<map:serializer name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
- <encoder>jpeg-encoder</encoder>
</map:serializer>
<!-- this node is inserted inside the map:pipline tag -->
@@ -55,9 +53,6 @@
<!-- this line goes inside the map:serializers tag -->
<map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
- <encoder>jpeg-encoder</encoder>
- <transparent>false</transparent>
- <background>#FF0000</background>
</map:serializer>
<!-- this node is inserted inside the map:pipline tag -->