forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527000 - /forrest/trunk/main/var/
Date Tue, 10 Apr 2007 02:35:16 GMT
Author: crossley
Date: Mon Apr  9 19:35:15 2007
New Revision: 527000

URL: http://svn.apache.org/viewvc?view=rev&rev=527000
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/var/catalogMountSnippet.xsl
    forrest/trunk/main/var/initial_catalog.xcat
    forrest/trunk/main/var/initial_plugins_locationmap.xml
    forrest/trunk/main/var/initial_plugins_sitemap.xmap
    forrest/trunk/main/var/pluginLmMountSnippet.xsl
    forrest/trunk/main/var/pluginMountSnippet.xsl
    forrest/trunk/main/var/pluginlist2echo.xsl
    forrest/trunk/main/var/pluginlist2fetch.xsl
    forrest/trunk/main/var/skinlist2echo.xsl
    forrest/trunk/main/var/skinlist2fetch.xsl

Modified: forrest/trunk/main/var/catalogMountSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/catalogMountSnippet.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/catalogMountSnippet.xsl (original)
+++ forrest/trunk/main/var/catalogMountSnippet.xsl Mon Apr  9 19:35:15 2007
@@ -20,19 +20,15 @@
   xmlns:xcat="urn:oasis:names:tc:entity:xmlns:xml:catalog"
   exclude-result-prefixes="xcat"
 >
-
   <xsl:output method="xml" indent="yes"/>
-
   <xsl:param name="plugin-catalog-path"/>
-
   <xsl:key name="existing-catalogs" match="xcat:nextCatalog" use="@catalog"/>
-
   <xsl:template match="xcat:catalog">
     <xsl:element name="catalog"
       namespace="urn:oasis:names:tc:entity:xmlns:xml:catalog">
       <xsl:apply-templates/>
-       <xsl:if test="not(key('existing-catalogs', $plugin-catalog-path))">
-         <xsl:element name="nextCatalog"
+      <xsl:if test="not(key('existing-catalogs', $plugin-catalog-path))">
+        <xsl:element name="nextCatalog"
             namespace="urn:oasis:names:tc:entity:xmlns:xml:catalog">
           <xsl:attribute name="catalog">
             <xsl:value-of select="$plugin-catalog-path"/>
@@ -41,11 +37,9 @@
       </xsl:if>
     </xsl:element>
   </xsl:template>
-
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/var/initial_catalog.xcat
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/initial_catalog.xcat?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/initial_catalog.xcat (original)
+++ forrest/trunk/main/var/initial_catalog.xcat Mon Apr  9 19:35:15 2007
@@ -15,5 +15,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-</catalog>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"></catalog>

Modified: forrest/trunk/main/var/initial_plugins_locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/initial_plugins_locationmap.xml?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/initial_plugins_locationmap.xml (original)
+++ forrest/trunk/main/var/initial_plugins_locationmap.xml Mon Apr  9 19:35:15 2007
@@ -23,8 +23,5 @@
           src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-
-  <locator>
-
-  </locator>
+  <locator></locator>
 </locationmap>

Modified: forrest/trunk/main/var/initial_plugins_sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/initial_plugins_sitemap.xmap?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/initial_plugins_sitemap.xmap (original)
+++ forrest/trunk/main/var/initial_plugins_sitemap.xmap Mon Apr  9 19:35:15 2007
@@ -15,22 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-  <!-- ============================================================ -->
-  <!-- Plugin Sitemap                                               -->
-  <!--                                                              -->
-  <!-- This sitemap includes all enabled plugins in the generation  -->
-  <!-- process. It is mounted from the main Forrest sitemap after   -->
-  <!-- any project specific sitemap but before the default Forrest  -->
-  <!-- matchers. This enables plugins to override or extend default -->
-  <!-- Forrest behaviour whilst individual projects can override    -->
-  <!-- or extend the plugins behaviour.                             -->
-  <!-- ============================================================ -->
-  
-
+<!-- ============================================================ -->
+<!-- Plugin Sitemap                                               -->
+<!--                                                              -->
+<!-- This sitemap includes all enabled plugins in the generation  -->
+<!-- process. It is mounted from the main Forrest sitemap after   -->
+<!-- any project specific sitemap but before the default Forrest  -->
+<!-- matchers. This enables plugins to override or extend default -->
+<!-- Forrest behaviour whilst individual projects can override    -->
+<!-- or extend the plugins behaviour.                             -->
+<!-- ============================================================ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:pipelines>
-    <map:pipeline internal-only="false">
-    </map:pipeline>
+    <map:pipeline internal-only="false"></map:pipeline>
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/main/var/pluginLmMountSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginLmMountSnippet.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/pluginLmMountSnippet.xsl (original)
+++ forrest/trunk/main/var/pluginLmMountSnippet.xsl Mon Apr  9 19:35:15 2007
@@ -19,38 +19,26 @@
   xmlns="http://apache.org/forrest/locationmap/1.0"
   xmlns:lm="http://apache.org/forrest/locationmap/1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
-
-   <xsl:output method="xml" indent="yes" />
-   
-   <xsl:param name="plugin-name"/>
-   
-   
-   <xsl:template match="lm:locationmap">
+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="plugin-name"/>
+  <xsl:template match="lm:locationmap">
     <locationmap>
       <xsl:apply-templates/>
     </locationmap>
-   </xsl:template>
-   
-
-
-   <xsl:template match="lm:locator">
-     <locator>
-       <xsl:apply-templates/>
-       <xsl:element name="select">
-           <xsl:element name="mount">
-             <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/locationmap.xml</xsl:attribute>

-           </xsl:element>
-       </xsl:element>
-     </locator>
-    </xsl:template>
-    
-
+  </xsl:template>
+  <xsl:template match="lm:locator">
+    <locator>
+      <xsl:apply-templates/>
+      <xsl:element name="select">
+        <xsl:element name="mount">
+          <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/locationmap.xml</xsl:attribute>
+        </xsl:element>
+      </xsl:element>
+    </locator>
+  </xsl:template>
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
-  
 </xsl:stylesheet>
-

Modified: forrest/trunk/main/var/pluginMountSnippet.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginMountSnippet.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/pluginMountSnippet.xsl (original)
+++ forrest/trunk/main/var/pluginMountSnippet.xsl Mon Apr  9 19:35:15 2007
@@ -17,47 +17,39 @@
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-   <xsl:output method="xml" indent="yes" />
-
-   <xsl:param name="plugin-name" />
-   <xsl:param name="plugin-type" />
-
-   <xsl:template match="map:sitemap">
-     <map:sitemap>
+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="plugin-name" />
+  <xsl:param name="plugin-type" />
+  <xsl:template match="map:sitemap">
+    <map:sitemap>
       <xsl:apply-templates/>
-     </map:sitemap>
-   </xsl:template>
-   
-   <xsl:template match="map:pipelines">
-     <map:pipelines>
+    </map:sitemap>
+  </xsl:template>
+  <xsl:template match="map:pipelines">
+    <map:pipelines>
+      <xsl:apply-templates/>
+    </map:pipelines>
+  </xsl:template>
+  <xsl:template match="map:pipeline">
+    <map:pipeline>
       <xsl:apply-templates/>
-     </map:pipelines>
-   </xsl:template>
-
-   <xsl:template match="map:pipeline">
-     <map:pipeline>
-       <xsl:apply-templates/>
-       <xsl:element name="map:select">
-         <xsl:attribute name="type">exists</xsl:attribute>
-         <xsl:element name="map:when">
-           <xsl:attribute name="test">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of
select="$plugin-type"/>.xmap</xsl:attribute>
-           <xsl:element name="map:mount">
-             <xsl:attribute name="uri-prefix"/>
-             <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of
select="$plugin-type"/>.xmap</xsl:attribute> 
-             <xsl:attribute name="check-reload">yes</xsl:attribute>  
-             <xsl:attribute name="pass-through">true</xsl:attribute>
-           </xsl:element>
-         </xsl:element>
-       </xsl:element>
-     </map:pipeline>
-    </xsl:template>
-    
-    
-
+      <xsl:element name="map:select">
+        <xsl:attribute name="type">exists</xsl:attribute>
+        <xsl:element name="map:when">
+          <xsl:attribute name="test">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of
select="$plugin-type"/>.xmap</xsl:attribute>
+          <xsl:element name="map:mount">
+            <xsl:attribute name="uri-prefix"/>
+            <xsl:attribute name="src">{forrest:forrest.plugins}/<xsl:value-of select="$plugin-name"/>/<xsl:value-of
select="$plugin-type"/>.xmap</xsl:attribute>
+            <xsl:attribute name="check-reload">yes</xsl:attribute>
+            <xsl:attribute name="pass-through">true</xsl:attribute>
+          </xsl:element>
+        </xsl:element>
+      </xsl:element>
+    </map:pipeline>
+  </xsl:template>
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
       <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()"/>
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>
-

Modified: forrest/trunk/main/var/pluginlist2echo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginlist2echo.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/pluginlist2echo.xsl (original)
+++ forrest/trunk/main/var/pluginlist2echo.xsl Mon Apr  9 19:35:15 2007
@@ -16,11 +16,10 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:template match="plugins">
-      <project default="echoplugins">
-      	<target name="echoplugins">
-      	<echo>Available plugins:
+  <xsl:template match="plugins">
+    <project default="echoplugins">
+      <target name="echoplugins">
+        <echo>Available plugins:
 Forrest provides basic functionality for creating documentation in various
 formats from a range of source formats. However, additional functionlaity
 can be provided through plugins.
@@ -28,32 +27,28 @@
 Plugins may be maintained by other people and be available from
 outside the Forrest distribution. The list below details all known plugins.
 </echo>
-
-<echo>
+        <echo>
 =============
 Input Plugins
 =============
 </echo>
-  	    <xsl:apply-templates select="plugin[@type='input']" />
-
-<echo>
+        <xsl:apply-templates select="plugin[@type='input']" />
+        <echo>
 ==============
 Output Plugins
 ==============
 </echo>
-  	    <xsl:apply-templates select="plugin[@type='output']" />
-
-<echo>
+        <xsl:apply-templates select="plugin[@type='output']" />
+        <echo>
 ================
 Internal Plugins
 ================
 </echo>
-  	    <xsl:apply-templates select="plugin[@type='internal']" />
-	    </target>
-	  </project>
-	</xsl:template>
-	
-	<xsl:template match="plugin">
+        <xsl:apply-templates select="plugin[@type='internal']" />
+      </target>
+    </project>
+  </xsl:template>
+  <xsl:template match="plugin">
     <echo>
     * <xsl:value-of select="@name"/>
       - <xsl:value-of select="normalize-space(description)"/>
@@ -61,8 +56,7 @@
       - Author: <xsl:value-of select="@author"/>
       - Website: <xsl:value-of select="@website"/>
       - Version:  <xsl:value-of select="@version"/>
-      - Required Forrest Version: <xsl:value-of select="forrestVersion"/> 
+      - Required Forrest Version: <xsl:value-of select="forrestVersion"/>
     </echo>
-	</xsl:template>	
-	
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/var/pluginlist2fetch.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginlist2fetch.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/pluginlist2fetch.xsl (original)
+++ forrest/trunk/main/var/pluginlist2fetch.xsl Mon Apr  9 19:35:15 2007
@@ -16,95 +16,103 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-   <xsl:output method="xml" indent="yes" />
-
-   <xsl:param name="plugin-name" />
-   <xsl:param name="plugin-version" />
-   <xsl:param name="plugin-dir"/>
-   <xsl:param name="plugin-src-dir"/>
-   <xsl:param name="forrest-version" />
-
-   <xsl:template match="plugins">
-         <xsl:choose>
-           <xsl:when test="plugin[@name=$plugin-name]">
-      <project default="fetchplugin">
-         <target name="fetchplugin">
-           <xsl:attribute name="depends">
-            <xsl:if test="$plugin-version">
-              <xsl:text>fetch-local-versioned-plugin, fetch-remote-versioned-plugin-version-forrest,</xsl:text>
-            </xsl:if>
-            <xsl:text>fetch-local-unversioned-plugin, fetch-remote-unversioned-plugin-version-forrest,</xsl:text>
-            <xsl:text>fetch-remote-unversioned-plugin-unversion-forrest, final-check</xsl:text>
-           </xsl:attribute>
-         </target>
-
-         <target name="fetch-local-versioned-plugin">
-           <!-- Search for the local versionned plugin ...-->
-           <antcallback target="get-local" return="plugin-found">
-             <param name="local-plugin-version">
-               <xsl:attribute name="value">-<xsl:value-of select="$plugin-version"
/></xsl:attribute>
-             </param>
-             <param name="local-plugin-name">
-               <xsl:attribute name="value"><xsl:value-of select="$plugin-name" /></xsl:attribute>
-             </param>
-           </antcallback>
-         </target>
-
-         <target name="fetch-remote-versioned-plugin-version-forrest" unless="plugin-found">
-           <!-- Search for the remote versionned plugin in the versionned Forrest...-->
-           <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
-             <param name="download-plugin-version">
-               <xsl:attribute name="value">-<xsl:value-of select="$plugin-version"
/></xsl:attribute>
-             </param>
-             <param name="download-plugin-name">
-               <xsl:attribute name="value"><xsl:value-of select="$plugin-name" /></xsl:attribute>
-             </param>
-             <param name="download-forrest-version">
-               <xsl:attribute name="value"><xsl:value-of select="$forrest-version"
/>/</xsl:attribute>
-             </param>
-           </antcallback>
-         </target>
-
-         <target name="fetch-local-unversioned-plugin" unless="plugin-found">
-           <!-- Search for the local unversionned plugin ...-->
-           <antcallback target="get-local" return="plugin-found">
-             <param name="local-plugin-version" value=""/>
-             <param name="local-plugin-name">
-               <xsl:attribute name="value"><xsl:value-of select="$plugin-name" /></xsl:attribute>
-             </param>
-           </antcallback>
-         </target>
-
-         <target name="fetch-remote-unversioned-plugin-version-forrest" unless="plugin-found">
-           <!-- Search for the remote unversionned plugin in the versionned Forrest...-->
-           <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
-             <param name="download-plugin-version" value=""/>
-             <param name="download-plugin-name">
-               <xsl:attribute name="value"><xsl:value-of select="$plugin-name" /></xsl:attribute>
-             </param>
-             <param name="download-forrest-version">
-               <xsl:attribute name="value"><xsl:value-of select="$forrest-version"
/>/</xsl:attribute>
-             </param>
-           </antcallback>
-         </target>
-
-         <target name="fetch-remote-unversioned-plugin-unversion-forrest" unless="plugin-found">
-           <!-- Search for the remote unversionned plugin in the unversionned Forrest...-->
-           <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
-             <param name="download-plugin-version" value=""/>
-             <param name="download-plugin-name">
-               <xsl:attribute name="value"><xsl:value-of select="$plugin-name" /></xsl:attribute>
-             </param>
-             <param name="download-forrest-version" value=""/>
-           </antcallback>
-         </target>
-
-         <target name="get-local">
-           <echo>Trying to locally get ${local-plugin-name}${local-plugin-version}</echo>
-           <trycatch property="plugin-found">
+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="plugin-name" />
+  <xsl:param name="plugin-version" />
+  <xsl:param name="plugin-dir"/>
+  <xsl:param name="plugin-src-dir"/>
+  <xsl:param name="forrest-version" />
+  <xsl:template match="plugins">
+    <xsl:choose>
+      <xsl:when test="plugin[@name=$plugin-name]">
+        <project default="fetchplugin">
+          <target name="fetchplugin">
+            <xsl:attribute name="depends">
+              <xsl:if test="$plugin-version">
+<xsl:text>fetch-local-versioned-plugin, fetch-remote-versioned-plugin-version-forrest,</xsl:text>
+              </xsl:if>
+<xsl:text>fetch-local-unversioned-plugin, fetch-remote-unversioned-plugin-version-forrest,</xsl:text>
+<xsl:text>fetch-remote-unversioned-plugin-unversion-forrest, final-check</xsl:text>
+            </xsl:attribute>
+          </target>
+          <target name="fetch-local-versioned-plugin">
+<!-- Search for the local versionned plugin ...-->
+            <antcallback target="get-local" return="plugin-found">
+              <param name="local-plugin-version">
+                <xsl:attribute name="value">-<xsl:value-of select="$plugin-version"
/>
+                </xsl:attribute>
+              </param>
+              <param name="local-plugin-name">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$plugin-name" />
+                </xsl:attribute>
+              </param>
+            </antcallback>
+          </target>
+          <target name="fetch-remote-versioned-plugin-version-forrest" unless="plugin-found">
+<!-- Search for the remote versionned plugin in the versionned Forrest...-->
+            <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
+              <param name="download-plugin-version">
+                <xsl:attribute name="value">-<xsl:value-of select="$plugin-version"
/>
+                </xsl:attribute>
+              </param>
+              <param name="download-plugin-name">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$plugin-name" />
+                </xsl:attribute>
+              </param>
+              <param name="download-forrest-version">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$forrest-version" />/</xsl:attribute>
+              </param>
+            </antcallback>
+          </target>
+          <target name="fetch-local-unversioned-plugin" unless="plugin-found">
+<!-- Search for the local unversionned plugin ...-->
+            <antcallback target="get-local" return="plugin-found">
+              <param name="local-plugin-version" value=""/>
+              <param name="local-plugin-name">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$plugin-name" />
+                </xsl:attribute>
+              </param>
+            </antcallback>
+          </target>
+          <target name="fetch-remote-unversioned-plugin-version-forrest" unless="plugin-found">
+<!-- Search for the remote unversionned plugin in the versionned Forrest...-->
+            <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
+              <param name="download-plugin-version" value=""/>
+              <param name="download-plugin-name">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$plugin-name" />
+                </xsl:attribute>
+              </param>
+              <param name="download-forrest-version">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$forrest-version" />/</xsl:attribute>
+              </param>
+            </antcallback>
+          </target>
+          <target name="fetch-remote-unversioned-plugin-unversion-forrest" unless="plugin-found">
+<!-- Search for the remote unversionned plugin in the unversionned Forrest...-->
+            <antcallback target="download" return="plugin-found,desired.plugin.zip.present">
+              <param name="download-plugin-version" value=""/>
+              <param name="download-plugin-name">
+                <xsl:attribute name="value">
+                  <xsl:value-of select="$plugin-name" />
+                </xsl:attribute>
+              </param>
+              <param name="download-forrest-version" value=""/>
+            </antcallback>
+          </target>
+          <target name="get-local">
+            <echo>Trying to locally get ${local-plugin-name}${local-plugin-version}</echo>
+            <trycatch property="plugin-found">
               <try>
                 <for param="plugin-src-dir">
-                  <xsl:attribute name="list"><xsl:value-of select="$plugin-src-dir"
/></xsl:attribute>
+                  <xsl:attribute name="list">
+                    <xsl:value-of select="$plugin-src-dir" />
+                  </xsl:attribute>
                   <sequential>
                     <echo>Looking in local @{plugin-src-dir}</echo>
                     <if>
@@ -128,99 +136,106 @@
                 <echo>Plugin ${local-plugin-name}${local-plugin-version} deployed !
Ready to configure</echo>
               </catch>
             </trycatch>
-         </target>
-
-         <target name="download" depends="keep-original-zip,get-from-remote-site,is-downloaded,remove-original-zip"/>
-
-         <target name="keep-original-zip" depends="available-original-zip" if="original.zip.exists">
-           <copy preservelastmodified="true">
-             <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
-             <xsl:attribute name="tofile"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
-           </copy>
-         </target>
-
-         <target name="available-original-zip">
-           <available property="original.zip.exists">
-             <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
-           </available>
-         </target>
-
-         <target name="get-from-remote-site">
-           <echo>Tying to download ${download-plugin-name}${download-plugin-version}
from the distribution site ...</echo>
-           <!-- FIXME the following test does not work... -->
-           <if>
-             <not><equals arg2="">
-               <xsl:attribute name="arg1">${download.forrest.version}</xsl:attribute>
-             </equals></not>
-             <then>
-               <echo>Using Forrest version : ${download-forrest-version}</echo>
-             </then>
-           </if>
-           <!-- Get from the remote URL -->
-           <get verbose="true" usetimestamp="true" ignoreerrors="true">
-             <xsl:attribute name="src"><xsl:value-of select="plugin[@name=$plugin-name]/@url"
/>/${download-forrest-version}${download-plugin-name}${download-plugin-version}.zip</xsl:attribute>
-             <xsl:attribute name="dest"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
-           </get>
-           <!-- Check if a zip has been downloaded from this URL -->
-           <available property="desired.plugin.zip.present">
-             <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
-           </available>
-           <condition property="plugin-found">
-             <!-- or -->
-               <and>
-                 <isset property="desired.plugin.zip.present"/>
-                 <not><isset property="original.zip.exists"/></not>
-               </and>
-           </condition>
-         </target>
-
-         <target name="is-downloaded" if="original.zip.exists">
-           <!-- Check is the downloaded file is more recent than the original zip ...
-->
-           <uptodate property="no-difference-found">
-             <xsl:attribute name="srcfile"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
-             <xsl:attribute name="targetfile"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
-           </uptodate>
-           <!-- If there are differences, the plugin is found -->
-           <if>
-              <not><isset property="no-difference-found"/></not>
+          </target>
+          <target name="download" depends="keep-original-zip,get-from-remote-site,is-downloaded,remove-original-zip"/>
+          <target name="keep-original-zip" depends="available-original-zip" if="original.zip.exists">
+            <copy preservelastmodified="true">
+              <xsl:attribute name="file">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
+              <xsl:attribute name="tofile">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
+            </copy>
+          </target>
+          <target name="available-original-zip">
+            <available property="original.zip.exists">
+              <xsl:attribute name="file">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
+            </available>
+          </target>
+          <target name="get-from-remote-site">
+            <echo>Tying to download ${download-plugin-name}${download-plugin-version}
from the distribution site ...</echo>
+<!-- FIXME the following test does not work... -->
+            <if>
+              <not>
+                <equals arg2="">
+                  <xsl:attribute name="arg1">${download.forrest.version}</xsl:attribute>
+                </equals>
+              </not>
+              <then>
+                <echo>Using Forrest version : ${download-forrest-version}</echo>
+              </then>
+            </if>
+<!-- Get from the remote URL -->
+            <get verbose="true" usetimestamp="true" ignoreerrors="true">
+              <xsl:attribute name="src">
+                <xsl:value-of select="plugin[@name=$plugin-name]/@url" />/${download-forrest-version}${download-plugin-name}${download-plugin-version}.zip</xsl:attribute>
+              <xsl:attribute name="dest">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
+            </get>
+<!-- Check if a zip has been downloaded from this URL -->
+            <available property="desired.plugin.zip.present">
+              <xsl:attribute name="file">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
+            </available>
+            <condition property="plugin-found">
+<!-- or -->
+              <and>
+                <isset property="desired.plugin.zip.present"/>
+                <not>
+                  <isset property="original.zip.exists"/>
+                </not>
+              </and>
+            </condition>
+          </target>
+          <target name="is-downloaded" if="original.zip.exists">
+<!-- Check is the downloaded file is more recent than the original zip ... -->
+            <uptodate property="no-difference-found">
+              <xsl:attribute name="srcfile">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip</xsl:attribute>
+              <xsl:attribute name="targetfile">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
+            </uptodate>
+<!-- If there are differences, the plugin is found -->
+            <if>
+              <not>
+                <isset property="no-difference-found"/>
+              </not>
               <then>
                 <property name="plugin-found" value="true"/>
               </then>
-           </if>
-         </target>
-
-         <target name="remove-original-zip" if="original.zip.exists">
-           <!-- Now, we can delete the original -->
-           <delete>
-             <xsl:attribute name="file"><xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
-           </delete>
-         </target>
-
-         <target name="final-check" depends="has-been-downloaded,downloaded-message,uptodate-message,not-found-message"/>
-
-         <target name="has-been-downloaded" if="desired.plugin.zip.present">
-           <condition property="up-to-date">
-             <not><isset property="plugin-found"/></not>
-           </condition>
-           <condition property="downloaded">
-             <isset property="plugin-found"/>
-           </condition>
-         </target>
-
-         <target name="downloaded-message" if="downloaded">
-           <echo>Plugin <xsl:value-of select="$plugin-name" /> downloaded ! Ready
to install</echo>
-         </target>
-
-         <target name="uptodate-message" if="up-to-date">
-           <echo>Plugin <xsl:value-of select="$plugin-name" /> was up-to-date
! Ready to configure</echo>
-           <property name="plugin-found" value="true"/>
-         </target>
-
-         <target name="not-found-message" unless="desired.plugin.zip.present">
-           <fail>
+            </if>
+          </target>
+          <target name="remove-original-zip" if="original.zip.exists">
+<!-- Now, we can delete the original -->
+            <delete>
+              <xsl:attribute name="file">
+                <xsl:value-of select="$plugin-dir"/>${download-plugin-name}.zip.orig</xsl:attribute>
+            </delete>
+          </target>
+          <target name="final-check" depends="has-been-downloaded,downloaded-message,uptodate-message,not-found-message"/>
+          <target name="has-been-downloaded" if="desired.plugin.zip.present">
+            <condition property="up-to-date">
+              <not>
+                <isset property="plugin-found"/>
+              </not>
+            </condition>
+            <condition property="downloaded">
+              <isset property="plugin-found"/>
+            </condition>
+          </target>
+          <target name="downloaded-message" if="downloaded">
+            <echo>Plugin <xsl:value-of select="$plugin-name" /> downloaded !
Ready to install</echo>
+          </target>
+          <target name="uptodate-message" if="up-to-date">
+            <echo>Plugin <xsl:value-of select="$plugin-name" /> was up-to-date
! Ready to configure</echo>
+            <property name="plugin-found" value="true"/>
+          </target>
+          <target name="not-found-message" unless="desired.plugin.zip.present">
+            <fail>
   Unable to download the
   "<xsl:value-of select="$plugin-name" />" plugin
-  <xsl:if test="$plugin-version">version <xsl:value-of select="$plugin-version"/></xsl:if>
+  <xsl:if test="$plugin-version">version <xsl:value-of select="$plugin-version"/>
+              </xsl:if>
   or an equivalent unversioned plugin
   from <xsl:value-of select="plugin[@name=$plugin-name]/@url" />
   There are a number of possible causes for this:
@@ -236,22 +251,18 @@
   To manually install a plugin, download the plugin zip file from
   <xsl:value-of select="plugin[@name=$plugin-name]/@url"/> and
   extract it into
-  <xsl:value-of select="$plugin-dir"/><xsl:value-of select="$plugin-name" />
-           </fail>
-         </target>
-
-      </project>
-         </xsl:when>
-         <xsl:otherwise>
-            <project default="findPlugin">
-              <target name="findPlugin"/>
-            </project>
-         </xsl:otherwise>
-       </xsl:choose>
-   </xsl:template>
-
-   <xsl:template match="plugin">
-   </xsl:template>
-
+  <xsl:value-of select="$plugin-dir"/>
+              <xsl:value-of select="$plugin-name" />
+            </fail>
+          </target>
+        </project>
+      </xsl:when>
+      <xsl:otherwise>
+        <project default="findPlugin">
+          <target name="findPlugin"/>
+        </project>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <xsl:template match="plugin"></xsl:template>
 </xsl:stylesheet>
-

Modified: forrest/trunk/main/var/skinlist2echo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/skinlist2echo.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/skinlist2echo.xsl (original)
+++ forrest/trunk/main/var/skinlist2echo.xsl Mon Apr  9 19:35:15 2007
@@ -16,11 +16,10 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:template match="skins">
-      <project default="echoskins">
-      	<target name="echoskins">
-      	<echo>Available skins:
+  <xsl:template match="skins">
+    <project default="echoskins">
+      <target name="echoskins">
+        <echo>Available skins:
 Forrest provides the following default skins which should meet most needs:
 
 Current:
@@ -35,17 +34,15 @@
 Additional skins which are maintained by other people are available from
 outside the Forrest distribution. Currently these are only basic test skins
 to demonstrate the concept of a remote skin respository.</echo>
-  	    <xsl:apply-templates select="skin" />
-	    </target>
-	  </project>
-	</xsl:template>
-	
-	<xsl:template match="skin">
-<echo>
+        <xsl:apply-templates select="skin" />
+      </target>
+    </project>
+  </xsl:template>
+  <xsl:template match="skin">
+    <echo>
 * <xsl:value-of select="@name"/> - <xsl:value-of select="normalize-space(description)"/>
   - author: <xsl:value-of select="@author"/>
-  - website: <xsl:value-of select="@website"/> 	    
-</echo>
-	</xsl:template>	
-	
+  - website: <xsl:value-of select="@website"/>
+    </echo>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/var/skinlist2fetch.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/skinlist2fetch.xsl?view=diff&rev=527000&r1=526999&r2=527000
==============================================================================
--- forrest/trunk/main/var/skinlist2fetch.xsl (original)
+++ forrest/trunk/main/var/skinlist2fetch.xsl Mon Apr  9 19:35:15 2007
@@ -16,54 +16,48 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-   <xsl:output method="xml" indent="yes" />
-
-   <xsl:param name="skin-name" />
-   <xsl:param name="forrest-version" />
-
-   <xsl:template match="skins">
-      <project default="fetchskin">
-      
-         <target name="fetchskin" depends="fetch-versioned-skin, fetch-unversioned-skin,
final-check"/>
-
-         <target name="fetch-versioned-skin">
-            <echo>Trying to get "<xsl:value-of select="$skin-name" />" skin version

+  <xsl:output method="xml" indent="yes" />
+  <xsl:param name="skin-name" />
+  <xsl:param name="forrest-version" />
+  <xsl:template match="skins">
+    <project default="fetchskin">
+      <target name="fetchskin" depends="fetch-versioned-skin, fetch-unversioned-skin,
final-check"/>
+      <target name="fetch-versioned-skin">
+        <echo>Trying to get "<xsl:value-of select="$skin-name" />" skin version

                   <xsl:value-of select="$forrest-version" />...</echo>
-            <get verbose="true" usetimestamp="true" ignoreerrors="true">
-               <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url"
/><xsl:value-of select="$skin-name" />-<xsl:value-of select="$forrest-version"
/>.zip</xsl:attribute>
-               <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
-            </get>
-            <available property="versioned-skin.present">
-               <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
-            </available>
-         </target>
-
-         <target name="fetch-unversioned-skin" unless="versioned-skin.present">
-            <echo>Versioned skin unavailable, trying to get versionless skin...</echo>
-            <get verbose="true" usetimestamp="true" ignoreerrors="true">
-               <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url"
/><xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-               <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
-            </get>
-         </target>
-
-         <target name="final-check">
-            <available property="skin.present">
-               <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
-            </available>
-            <fail unless="skin.present">
+        <get verbose="true" usetimestamp="true" ignoreerrors="true">
+          <xsl:attribute name="src">
+            <xsl:value-of select="skin[@name=$skin-name]/@url" />
+            <xsl:value-of select="$skin-name" />-<xsl:value-of select="$forrest-version"
/>.zip</xsl:attribute>
+          <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
+        </get>
+        <available property="versioned-skin.present">
+          <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
+        </available>
+      </target>
+      <target name="fetch-unversioned-skin" unless="versioned-skin.present">
+        <echo>Versioned skin unavailable, trying to get versionless skin...</echo>
+        <get verbose="true" usetimestamp="true" ignoreerrors="true">
+          <xsl:attribute name="src">
+            <xsl:value-of select="skin[@name=$skin-name]/@url" />
+            <xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+          <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
+        </get>
+      </target>
+      <target name="final-check">
+        <available property="skin.present">
+          <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of
select="$skin-name" />.zip</xsl:attribute>
+        </available>
+        <fail unless="skin.present">
               Unable to download the 
               "<xsl:value-of select="$skin-name" />" skin from 
               <xsl:value-of select="skin[@name=$skin-name]/@url" />
               In case the reason is the network connection, you can try 
               installing the package manually by placing the file in the 
               skins directory.</fail>
-            <echo>Skin "<xsl:value-of select="$skin-name" />" correctly installed.</echo>
-         </target>
-      </project>
-   </xsl:template>
-
-   <xsl:template match="skin">
-   </xsl:template>
-   
+        <echo>Skin "<xsl:value-of select="$skin-name" />" correctly installed.</echo>
+      </target>
+    </project>
+  </xsl:template>
+  <xsl:template match="skin"></xsl:template>
 </xsl:stylesheet>
-



Mime
View raw message