forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: rev 76144 - in forrest/trunk: docs-author main/webapp site-author
Date Wed, 17 Nov 2004 15:47:05 GMT
Author: rgardler
Date: Wed Nov 17 07:47:04 2004
New Revision: 76144

Modified:
   forrest/trunk/docs-author/forrest.properties
   forrest/trunk/main/webapp/default-forrest.properties
   forrest/trunk/main/webapp/faq.xmap
   forrest/trunk/main/webapp/sitemap.xmap
   forrest/trunk/site-author/forrest.properties
Log:
Moved PDF output code to pdf-output plugin

Modified: forrest/trunk/docs-author/forrest.properties
==============================================================================
--- forrest/trunk/docs-author/forrest.properties	(original)
+++ forrest/trunk/docs-author/forrest.properties	Wed Nov 17 07:47:04 2004
@@ -30,4 +30,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=OpenOffice.org
+project.required.plugins=org.apache.forrest.plugin.pdf-output

Modified: forrest/trunk/main/webapp/default-forrest.properties
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties	(original)
+++ forrest/trunk/main/webapp/default-forrest.properties	Wed Nov 17 07:47:04 2004
@@ -140,5 +140,5 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=OpenOffice.org,simplified-docbook,wiki
+project.required.plugins=OpenOffice.org,simplified-docbook,wiki,org.apache.forrest.plugin.pdf-output
 

Modified: forrest/trunk/main/webapp/faq.xmap
==============================================================================
--- forrest/trunk/main/webapp/faq.xmap	(original)
+++ forrest/trunk/main/webapp/faq.xmap	Wed Nov 17 07:47:04 2004
@@ -15,15 +15,14 @@
   limitations under the License.
 -->
 <!-- ===============================================
-'faq' pipelines.  Implements source XML, body HTML and output PDF pipelines.
+'faq' pipelines.  Implements source XML, body HTML pipelines.
 
 Handles different FAQ DTD versions by sniffing the DOCTYPE, and
 applying an appropriate transformation.
 
-Generates  :  Source XML, body HTML, output PDF
+Generates  :  Source XML, body HTML
 Example URL:  http://localhost:8888/faq.xml       # Source XML for FAQ
 Example URL:  http://localhost:8888/body-faq.html # Body HTML for FAQ
-Example URL:  http://localhost:8888/faq.pdf       # PDF of FAQ
 Used by    :  sitemap.xmap, which binds these generic pipelines to URLs.
 Uses       :  content/xdocs/**.xml, depending on URL binding.
 

Modified: forrest/trunk/main/webapp/sitemap.xmap
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap	(original)
+++ forrest/trunk/main/webapp/sitemap.xmap	Wed Nov 17 07:47:04 2004
@@ -187,8 +187,6 @@
         <doctype-system>document-v13.dtd</doctype-system>
       </map:serializer>
 
-      <map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf" />
-
       <map:serializer name="links" src="org.apache.cocoon.serialization.LinkSerializer">
         <encoding>ISO-8859-1</encoding>
       </map:serializer>
@@ -319,6 +317,17 @@
       </map:pipeline>
       
       
+      <!-- FIXME: temporary fix to get PDF-output plugin working
+           this mount should be managed by the plugns framework -->
+      <map:pipeline internal-only="false">
+        <map:select type="exists">
+          <map:when test="{forrest:plugins}/org.apache.forrest.plugin.pdf-output/output.xmap">
+            <map:mount uri-prefix="" src="{forrest:plugins}/org.apache.forrest.plugin.pdf-output/output.xmap"
check-reload="yes" pass-through="true"/>
+          </map:when>
+        </map:select>
+      </map:pipeline>
+      
+      
       <!-- FIXME: temporary fix to get IMSManifest plugin working
            this mount should be managed by the plugns framework -->
       <map:pipeline internal-only="false">
@@ -630,13 +639,6 @@
       <map:match pattern="**faq.fo">
         <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
       </map:match>
-
-      <!-- generate .pdf files from .fo -->
-      <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
-        <map:generate src="cocoon:/{1}{2}.fo"/>
-        <map:serialize type="fo2pdf"/>
-      </map:match>
-
 
       <!-- generate .fo from .xml  -->
       <map:match type="regexp" pattern="^(.*?)([^/]*).fo$">

Modified: forrest/trunk/site-author/forrest.properties
==============================================================================
--- forrest/trunk/site-author/forrest.properties	(original)
+++ forrest/trunk/site-author/forrest.properties	Wed Nov 17 07:47:04 2004
@@ -31,4 +31,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=
+project.required.plugins=org.apache.forrest.plugin.pdf-output

Mime
View raw message