forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject svn commit: r421797 - in /forrest/trunk: plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/ whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/ whiteboard/plugins/org.a...
Date Fri, 14 Jul 2006 03:44:51 GMT
Author: twilliams
Date: Thu Jul 13 20:44:51 2006
New Revision: 421797

URL: http://svn.apache.org/viewvc?rev=421797&view=rev
Log:
The second part of the fix for FOR-488  I've attempted to find all of our uses of zip:// and
update them, but I'm sure some eluded me.  If you are aware of other places where we use it,
please let me know or fix them.  

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-document.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-writer.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/SXWGenerator.java
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-document.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-document.xsl?rev=421797&r1=421796&r2=421797&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-document.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-document.xsl
Thu Jul 13 20:44:51 2006
@@ -26,10 +26,10 @@
   <xsl:template match="/">
     <office:document xmlns:c="http://apache.org/cocoon/include/1.0" xmlns:office="http://openoffice.org/2000/office"
xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text"
xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d"
xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form"
xmlns:script="http://openoffice.org/2000/script" xmlns:config="http://openoffice.org/2001/config"
office:class="text" office:version="1.0">
       <c:include select="/*/*">
-        <xsl:attribute name="src">zip://meta.xml@<xsl:value-of select="$src"/></xsl:attribute>
+        <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/meta.xml</xsl:attribute>
       </c:include>
       <c:include select="/*/*">
-        <xsl:attribute name="src">zip://content.xml@<xsl:value-of select="$src"/></xsl:attribute>
+        <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/content.xml</xsl:attribute>
       </c:include>      
     </office:document>
   </xsl:template>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-writer.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-writer.xsl?rev=421797&r1=421796&r2=421797&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-writer.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources/stylesheets/aggregates/openoffice-writer.xsl
Thu Jul 13 20:44:51 2006
@@ -26,10 +26,10 @@
   <xsl:template match="/">
     <office:document xmlns:c="http://apache.org/cocoon/include/1.0" xmlns:office="http://openoffice.org/2000/office"
xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text"
xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle"
xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d"
xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form"
xmlns:script="http://openoffice.org/2000/script" xmlns:config="http://openoffice.org/2001/config"
office:class="text" office:version="1.0">
       <c:include select="/*/*">
-        <xsl:attribute name="src">zip://meta.xml@<xsl:value-of select="$src"/></xsl:attribute>
+        <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/meta.xml</xsl:attribute>
       </c:include>
       <c:include select="/*/*">
-        <xsl:attribute name="src">zip://content.xml@<xsl:value-of select="$src"/></xsl:attribute>
+        <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/content.xml</xsl:attribute>
       </c:include>      
     </office:document>
   </xsl:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/SXWGenerator.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/SXWGenerator.java?rev=421797&r1=421796&r2=421797&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/SXWGenerator.java
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/src/java/org/apache/forrest/generation/SXWGenerator.java
Thu Jul 13 20:44:51 2006
@@ -123,10 +123,10 @@
 {{{
 <office:document xmlns:**>
   <c:include select="...">
-    <xsl:attribute name="src">zip://meta.xml@<xsl:value-of select="$src"/></xsl:attribute>
+    <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/meta.xml</xsl:attribute>
   </c:include>
   <c:include select="...">
-    <xsl:attribute name="src">zip://content.xml@<xsl:value-of select="$src"/></xsl:attribute>
+    <xsl:attribute name="src">zip:<xsl:value-of select="$src"/>!/content.xml</xsl:attribute>
   </c:include>
 </office:document>
 }}}
@@ -171,12 +171,12 @@
             super.contentHandler.startElement("http://openoffice.org/2000/office", "document",
"office" + ':' + "document", new AttributesImpl());
 
             //      from org.apache.cocoon.transformation.XIncludeTransformer
-            SourceUtil.toSAX(super.resolver.resolveURI("zip://meta.xml@" + this.inputSource.getURI()),
+            SourceUtil.toSAX(super.resolver.resolveURI("zip:" + this.inputSource.getURI()
+ "!/meta.xml"),
                     new IncludeXMLConsumer(this.contentHandler));
             // useful to get size of page from which calculate relative width of an image

-            SourceUtil.toSAX(super.resolver.resolveURI("zip://styles.xml@" + this.inputSource.getURI()),
+            SourceUtil.toSAX(super.resolver.resolveURI("zip:" + this.inputSource.getURI()
+ "!/styles.xml"),
                     new IncludeXMLConsumer(this.contentHandler));
-            SourceUtil.toSAX(super.resolver.resolveURI("zip://content.xml@" + this.inputSource.getURI()),
+            SourceUtil.toSAX(super.resolver.resolveURI("zip:" + this.inputSource.getURI()
+ "!/content.xml"),
                     new IncludeXMLConsumer(this.contentHandler));
             
             super.contentHandler.endElement("http://openoffice.org/2000/office", "document",
"office" + ':' + "document");

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap?rev=421797&r1=421796&r2=421797&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap Thu Jul
13 20:44:51 2006
@@ -39,13 +39,13 @@
     </map:pipeline>
     <map:pipeline internal="true">
       <map:match pattern="**.meta.odt.xml">
-        <map:generate src="zip://meta.xml@{lm:project.{1}.odt}" />
+        <map:generate src="zip:{lm:project.{1}.odt}!/meta.xml" />
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
     <map:pipeline internal="true">
       <map:match pattern="**.content.odt.xml">
-        <map:generate src="zip://content.xml@{lm:project.{1}.odt}" />
+        <map:generate src="zip:{lm:project.{1}.odt}!/content.xml" />
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>



Mime
View raw message