forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r1076070 - in /forrest/trunk: etc/ whiteboard/plugins/ whiteboard/plugins/org.apache.forrest.plugin.input.Resume/ whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/
Date Wed, 02 Mar 2011 00:44:18 GMT
Author: crossley
Date: Wed Mar  2 00:44:17 2011
New Revision: 1076070

URL: http://svn.apache.org/viewvc?rev=1076070&view=rev
Log:
Use Locationmap for resolution of resources and files.
Resources are exposed via {lm:Resume.*}
Issue: FOR-726

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/locationmap.xml
      - copied, changed from r1075667, forrest/trunk/plugins/pluginTemplate/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/directory-to-resumes.xsl
      - copied unchanged from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/directory2resumes.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/oo-to-resume.xsl
      - copied unchanged from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/ooToResume.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resume-to-document.xsl
      - copied unchanged from r1075671, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resume2xdoc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-document.xsl
      - copied, changed from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2xdoc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-resumeSiteSnippet.xsl
      - copied unchanged from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2resumeSiteSnippet.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-skillDocument.xsl
      - copied, changed from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2skillxdoc.xsl
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/directory2resumes.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/ooToResume.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resume2xdoc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2resumeSiteSnippet.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2skillxdoc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2xdoc.xsl
Modified:
    forrest/trunk/etc/review-plugin-deployment.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/build.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/status.xml
    forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml

Modified: forrest/trunk/etc/review-plugin-deployment.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/review-plugin-deployment.txt?rev=1076070&r1=1076069&r2=1076070&view=diff
==============================================================================
--- forrest/trunk/etc/review-plugin-deployment.txt (original)
+++ forrest/trunk/etc/review-plugin-deployment.txt Wed Mar  2 00:44:17 2011
@@ -3,7 +3,7 @@ Last reviewed: 2010-06-18
 
 Legend:
  1 Has locationmap.xml file and hence must be 0.8+ version.
- 2 Reviewed for locationmap and 0.8+ forrestVersion.
+ 2 Reviewed for locationmap and 0.8+ forrestVersion. (FOR-726)
  3 Has Java code.
  4 Current forrestVersion and has an entry in the "plugins descriptor" files.
  5 Has different number in its build.xml file.
@@ -41,7 +41,7 @@ org.apache.forrest.plugin.OpenOffice.org
 org.apache.forrest.plugin.input.Blog               | n        8        n           8  n 
n
 org.apache.forrest.plugin.input.Daisy              | y        8        y           7  n 
n     y (build hangs)
 org.apache.forrest.plugin.input.Lenya              | y        8        n           8  n 
n
-org.apache.forrest.plugin.input.Resume             | n     y  8        n           8  n 
n
+org.apache.forrest.plugin.input.Resume             | y  y  y  8        n           8  n 
n
 org.apache.forrest.plugin.input.XDoc               | y        8        n     y     8  n 
n
 org.apache.forrest.plugin.input.baetle             | y        9        n           9  n 
y
 org.apache.forrest.plugin.input.citations          | y        8        y           8  n 
y

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/build.xml?rev=1076070&r1=1076069&r2=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/build.xml Wed
Mar  2 00:44:17 2011
@@ -20,7 +20,7 @@
   <property name="forrest.version" value="0.8"/>
   <property name="forrest.version.initial" value="0.8"/>
   <property name="type" value="input"/>
-  <property name="plugin-version" value="0.1"/>
+  <property name="plugin-version" value="0.2"/>
   <property name="description" value="Allows the use of documents conforming to the DTD's
developed by http://xmlresume.sourceforge.net. Also includes transformations from an OpenOffice.org
document to xmlresume format."/>
   <property name="author" value="Apache Forrest Project"/>
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.Resume"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap?rev=1076070&r1=1076069&r2=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap Wed
Mar  2 00:44:17 2011
@@ -38,18 +38,18 @@
     <map:resource name="source-file-resolver">
       <map:select type="exists">
 <!-- FIXME: need to peek inside document to ensure it is the correct type -->
-        <map:when test="{properties:content.xdocs}{uri}.sxw">
-          <map:generate type="sxw" src="{properties:content.xdocs}{uri}.sxw"/>
-          <map:transform src="resources/stylesheets/ooToResume.xsl"/>
+        <map:when test="{lm:project.{uri}.sxw}">
+          <map:generate type="sxw" src="{lm:project.{uri}.sxw}"/>
+          <map:transform src="{lm:Resume.transform.oo.resume}"/>
           <map:serialize type="xml"/>
         </map:when>
         <map:when test="{lm:{uri}.xml}">
-          <map:generate src="{properties:content.xdocs}{uri}.xml"/>
+          <map:generate src="{lm:project.{uri}.xml}"/>
           <map:transform type="xinclude"/>
           <map:serialize type="xml"/>
         </map:when>
-        <map:when test="{properties:content.xdocs}{uri}.xml">
-          <map:generate src="{properties:content.xdocs}{uri}.xml"/>
+        <map:when test="{lm:project.{uri}.xml}">
+          <map:generate src="{lm:project.{uri}.xml}"/>
           <map:transform type="xinclude"/>
           <map:serialize type="xml"/>
         </map:when>
@@ -60,9 +60,9 @@
         <map:select type="parameter">
           <map:parameter name="parameter-selector-test" value="{sourcetype}" />
           <map:when test="resume-v1.5.1">
-            <map:generate src="{properties:content.xdocs}{../../1}.xml"/>
-            <map:transform src="resources/stylesheets/resume2xdoc.xsl" />
-            <map:serialize type="xml"/>
+            <map:generate src="{lm:project.{../../1}.xml}"/>
+            <map:transform src="{lm:Resume.transform.resume.document}" />
+            <map:serialize type="xml-document"/>
           </map:when>
         </map:select>
       </map:act>
@@ -72,7 +72,7 @@
     <map:pipeline>
       <map:match pattern="**.xml">
         <map:call resource="transform-to-document">
-          <map:parameter name="src" value="{properties:content.xdocs}{1}.xml" />
+          <map:parameter name="src" value="{lm:project.{1}.xml}" />
         </map:call>
       </map:match>
       <map:match pattern="**.source.xml">
@@ -81,16 +81,16 @@
         </map:call>
       </map:match>
       <map:match pattern="team/all.source.xml">
-        <map:generate type="directory" src="{properties:content.xdocs}/team/resume">
+        <map:generate type="directory" src="{lm:project.team/resume}">
           <map:parameter name="include" value=".*.xml$"/>
         </map:generate>
-        <map:transform src="resources/stylesheets/directory2resumes.xsl"/>
+        <map:transform src="{lm:Resume.transform.directory.resumes}"/>
         <map:transform type="cinclude"/>
         <map:serialize type="xml"/>
       </map:match>
       <map:match pattern="resume.site.snippet.xml">
         <map:generate src="cocoon:/team/all.source.xml"/>
-        <map:transform src="resources/stylesheets/resumes2resumeSiteSnippet.xsl"/>
+        <map:transform src="{lm:Resume.transform.resumes.resumeSiteSnippet}"/>
         <map:serialize type="xml"/>
       </map:match>
     </map:pipeline>
@@ -102,27 +102,27 @@
       </map:match>
       <map:match pattern="team/allBySkill.xml">
         <map:generate src="cocoon:/team/all.source.xml"/>
-        <map:transform src="resources/stylesheets/resumes2skillxdoc.xsl"/>
+        <map:transform src="{lm:Resume.transform.resumes.skillDocument}"/>
         <map:serialize type="xml"/>
       </map:match>
       <map:match pattern="team/all.xml">
         <map:generate src="cocoon:/team/all.source.xml"/>
-        <map:transform src="resources/stylesheets/resumes2xdoc.xsl">
+        <map:transform src="{lm:Resume.transform.resumes.document}">
           <map:parameter name="candidateSkill" value="{request:candidateSkill}"/>
         </map:transform>
-        <map:serialize type="xml"/>
+        <map:serialize type="xml-document"/>
       </map:match>
       <map:match pattern="team/allWithSkill/*.xml">
         <map:generate src="cocoon:/team/all.source.xml"/>
-        <map:transform src="resources/stylesheets/resumes2xdoc.xsl">
+        <map:transform src="{lm:Resume.transform.resumes.document}">
           <map:parameter name="candidateSkill" value="{1}"/>
         </map:transform>
-        <map:serialize type="xml"/>
+        <map:serialize type="xml-document"/>
       </map:match>
       <map:match pattern="team/skill/**.xml">
         <map:generate src="cocoon://team/all.xml"/>
-        <map:transform src="resources/stylesheets/resume2xdoc.xsl" />
-        <map:serialize type="xml"/>
+        <map:transform src="{lm:Resume.transform.resume.document}"/>
+        <map:serialize type="xml-document"/>
       </map:match>
     </map:pipeline>
   </map:pipelines>

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/locationmap.xml
(from r1075667, forrest/trunk/plugins/pluginTemplate/locationmap.xml)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/locationmap.xml?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/locationmap.xml&p1=forrest/trunk/plugins/pluginTemplate/locationmap.xml&r1=1075667&r2=1076070&rev=1076070&view=diff
==============================================================================
--- forrest/trunk/plugins/pluginTemplate/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/locationmap.xml
Wed Mar  2 00:44:17 2011
@@ -28,12 +28,13 @@
     </selectors>
   </components>
   <locator>
-<!-- Uncomment the below matches once you have a stylesheet you wish to use. Note that
these are needed for the plugin to work on windows. See FOR-1108 -->
-  <!-- <match pattern="plugin.transform.*.*">
-         <select>
-           <location src="resources/stylesheets/{1}-to-{2}.xsl" />
-           <location src="{forrest:forrest.plugins}/@plugin-name@/resources/stylesheets/{1}-to-{2}.xsl"/>
-         </select>
-    </match> -->
+    <match pattern="Resume.transform.*.*">
+      <select>
+        <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+        <!-- start fix for FOR-1108 -->
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Resume/resources/stylesheets/{1}-to-{2}.xsl"/>
+        <!-- end fix for FOR-1108 -->
+      </select>
+    </match>
   </locator>
 </locationmap>

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-document.xsl
(from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2xdoc.xsl)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-document.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-document.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2xdoc.xsl&r1=1075667&r2=1076070&rev=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2xdoc.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-document.xsl
Wed Mar  2 00:44:17 2011
@@ -20,7 +20,7 @@
     xmlns:tag="http://forrest.apache.org/TagExpansion/0.1"
     xmlns:resume="http://xmlresume.sourceforge.net/resume/0.0"
     version="1.0">
-  <xsl:import href="resume2xdoc.xsl"/>
+  <xsl:import href="lm://Resume.transform.resume.document"/>
   <xsl:param name="candidateSkill"/>
   <xsl:template match="/">
     <xsl:apply-templates select="resumes"/>

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-skillDocument.xsl
(from r1075667, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2skillxdoc.xsl)
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-skillDocument.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-skillDocument.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2skillxdoc.xsl&r1=1075667&r2=1076070&rev=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes2skillxdoc.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/resources/stylesheets/resumes-to-skillDocument.xsl
Wed Mar  2 00:44:17 2011
@@ -20,7 +20,7 @@
     xmlns:tag="http://forrest.apache.org/TagExpansion/0.1"
     xmlns:resume="http://xmlresume.sourceforge.net/resume/0.0"
     version="1.0">
-  <xsl:import href="resume2xdoc.xsl"/>
+  <xsl:import href="lm://Resume.transform.resume.document"/>
   <xsl:key name="skillSets" match="resume:skillset" use="resume:title"/>
   <xsl:key name="skills" match="resume:skill" use="."/>
   <xsl:template match="/">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/status.xml?rev=1076070&r1=1076069&r2=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/status.xml Wed
Mar  2 00:44:17 2011
@@ -37,6 +37,13 @@
   </contexts>
   <changes>
 <!-- Add new releases here -->
+    <release version="0.2" date="unreleased">
+<!-- 2011-03 -->
+      <action type="add" context="code" dev="DC" importance="high" fixes-bug="FOR-726">
+        Use Locationmap for resolution of resources and files.
+        Resources are exposed via {lm:Resume.*}
+      </action>
+    </release>
     <release version="0.1" date="unreleased">
 <!-- 2011-03 -->
       <action dev="DC" type="update" context="code"

Modified: forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml?rev=1076070&r1=1076069&r2=1076070&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml (original)
+++ forrest/trunk/whiteboard/plugins/whiteboard-plugins.xml Wed Mar  2 00:44:17 2011
@@ -200,7 +200,7 @@
         website="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.input.Resume"
         url="http://forrest.apache.org/plugins/"
         publish="false"
-        version="0.1">
+        version="0.2">
     <description>
       Basic support for Resumes, renders a single resume, or allows sorting of a
       number of resumes on skill.



Mime
View raw message