morrijr 2002/07/15 14:32:19
Modified: lib Tag: cocoon_2_0_3_branch jars.xml
src/java/org/apache/cocoon/serialization Tag:
cocoon_2_0_3_branch FOPSerializer.java
src/webapp/samples Tag: cocoon_2_0_3_branch samples.xml
src/webapp/samples/hello-world Tag: cocoon_2_0_3_branch
sitemap.xmap
Added: legal Tag: cocoon_2_0_3_branch LICENSE.jfor
lib/optional Tag: cocoon_2_0_3_branch fop-0.20.4.jar
jfor-0.7.0.jar lucene-1.2.jar
Removed: lib/optional Tag: cocoon_2_0_3_branch lucene-1.2-rc2.jar
Log:
Added jfor, updated fop and lucene
Revision Changes Path
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/legal/LICENSE.jfor
Index: LICENSE.jfor
===================================================================
RCS file: /home/cvs/xml-cocoon2/legal/LICENSE.jfor,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.11.2.10 +12 -2 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.11.2.9
retrieving revision 1.11.2.10
diff -u -r1.11.2.9 -r1.11.2.10
--- jars.xml 12 Jul 2002 10:38:59 -0000 1.11.2.9
+++ jars.xml 15 Jul 2002 21:32:15 -0000 1.11.2.10
@@ -137,10 +137,20 @@
conforming to the XSL candidate release and then turns it into a PDF
document or allows you to preview it directly on screen.</description>
<used-by>FOP serializer</used-by>
- <lib>optional/fop-0.20.3.jar</lib>
+ <lib>optional/fop-0.20.4.jar</lib>
<homepage>http://xml.apache.org/fop/</homepage>
</file>
<file>
+ <title>XSL-FO to RTF converter</title>
+ <description>jfor is a Java application that reads XSL-FO documents
+ and converts them to RTF format, allowing them to be loaded in
+ common wordprocessors.
+ </description>
+ <used-by>RTF serializer</used-by>
+ <lib>optional/jfor-0.7.0.jar</lib>
+ <homepage>http://www.jfor.org</homepage>
+ </file>
+ <file>
<title>Simple SQL database</title>
<description>hsqldb is a relational database engine written in Java, with a
JDBC
driver, supporting a subset of ANSI-92 SQL. It offers a small, fast
@@ -200,7 +210,7 @@
<description>jakarta-lucene is a search engine toolkit designed for
indexing and searching of documents.</description>
<used-by>?</used-by>
- <lib>optional/lucene-1.2-rc2.jar</lib>
+ <lib>optional/lucene-1.2.jar</lib>
<homepage>http://jakarta.apache.org/lucene/</homepage>
</file>
<file>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/lib/optional/fop-0.20.4.jar
<<Binary file>>
1.1.2.1 +0 -0 xml-cocoon2/lib/optional/jfor-0.7.0.jar
<<Binary file>>
1.1.2.1 +0 -0 xml-cocoon2/lib/optional/lucene-1.2.jar
<<Binary file>>
No revision
No revision
1.7.2.1 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/serialization/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/FOPSerializer.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- FOPSerializer.java 19 Mar 2002 09:05:56 -0000 1.7
+++ FOPSerializer.java 15 Jul 2002 21:32:19 -0000 1.7.2.1
@@ -54,6 +54,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
@@ -196,7 +197,7 @@
driver = new Driver();
if(driver instanceof Loggable) {
- driver.setLogger(getLogger().getChildLogger("fop"));
+ driver.setLogger(new LogKitLogger(getLogger().getChildLogger("fop")));
}
if (this.rendererName == null) {
this.renderer = factory.createRenderer(mimetype);
No revision
No revision
1.3.2.3 +5 -2 xml-cocoon2/src/webapp/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/samples.xml,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- samples.xml 15 Jul 2002 07:27:16 -0000 1.3.2.2
+++ samples.xml 15 Jul 2002 21:32:19 -0000 1.3.2.3
@@ -46,7 +46,10 @@
</sample>
<sample name="PS" href="hello-world/hello.ps">
You prefer postscript? No problem, here it is!
- </sample>
+ </sample>
+ <sample name="RTF" href="hello-world/hello.rtf">
+ How about RTF? Load this one in your favorite wordprocessor!
+ </sample>
<sample name="XLS" href="hello-world/hello.xls">
Still stuck with legacy file formats? Don't worry, here is an example.
</sample>
No revision
No revision
1.2.2.1 +6 -0 xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- sitemap.xmap 27 Mar 2002 10:05:24 -0000 1.2
+++ sitemap.xmap 15 Jul 2002 21:32:19 -0000 1.2.2.1
@@ -142,6 +142,12 @@
<map:serialize type="fo2pdf"/>
</map:match>
+ <map:match pattern="hello.rtf">
+ <map:generate src="content/xml/hello-page.xml"/>
+ <map:transform src="style/xsl/simple-page2fo.xsl"/>
+ <map:serialize type="fo2rtf"/>
+ </map:match>
+
<map:match pattern="hello.ps">
<map:generate src="content/xml/hello-page.xml"/>
<map:transform src="style/xsl/simple-page2fo.xsl"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
