forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r1527159 - in /forrest/branches/update_cocoon_2.1.12: main/webapp/resources/stylesheets/ whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/
Date Sat, 28 Sep 2013 06:51:10 GMT
Author: crossley
Date: Sat Sep 28 06:51:10 2013
New Revision: 1527159

URL: http://svn.apache.org/r1527159
Log:
Using the fix for r1527156 does not work for Dispatcher, so need to explicitly a
dd the svg namespace using a Transformer.
Issue: FOR-1241

Added:
    forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
  (with props)
Modified:
    forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap

Added: forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl?rev=1527159&view=auto
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
(added)
+++ forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
Sat Sep 28 06:51:10 2013
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:import href="copyover.xsl"/>
+  <xsl:template match="/">
+    <svg xmlns="http://www.w3.org/2000/svg">
+      <xsl:copy>
+        <xsl:apply-templates select="svg/@*"/>
+      </xsl:copy>
+      <xsl:apply-templates/>
+    </svg>
+  </xsl:template>
+  <xsl:template match="svg">
+    <xsl:apply-templates/>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=1527159&r1=1527158&r2=1527159&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
(original)
+++ forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Sat Sep 28 06:51:10 2013
@@ -370,5 +370,8 @@
     <match pattern="transform.xml.variable.helper">
       <location src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl"
/>
     </match>
+    <match pattern="transform.xml.namespaced-svg">
+      <location src="{forrest:forrest.stylesheets}/add-namespace-svg.xsl" />
+    </match>
   </locator>
 </locationmap>

Modified: forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=1527159&r1=1527158&r2=1527159&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
(original)
+++ forrest/branches/update_cocoon_2.1.12/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
Sat Sep 28 06:51:10 2013
@@ -77,6 +77,7 @@
           <map:parameter name="stroke-color-name" value="{6}" />
           <map:parameter name="fg-color-name" value="{7}" />
         </map:transform>
+        <map:transform src="{lm:transform.xml.namespaced-svg}"/>
         <map:serialize type="svgxml" />
       </map:match>
       <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg-to-png">



Mime
View raw message