Author: rgardler
Date: Tue Sep 11 15:39:44 2007
New Revision: 574713

URL: http://svn.apache.org/viewvc?rev=574713&view=rev
Log:
Bring URL space into line with DOAP plugin

Modified:
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/input.xmap
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/index.xml
    
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/site.xml

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/input.xmap
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/input.xmap?rev=574713&r1=574712&r2=574713&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/input.xmap
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/input.xmap
 Tue Sep 11 15:39:44 2007
@@ -61,36 +61,37 @@
 <!-- ================================================================ -->
 <!-- indexes                                                          -->
 <!-- ================================================================ -->
-      <map:match pattern="personDetails/source.xml">
+      <map:match pattern="personDetails.source.xml">
         <map:generate type="file" src="{lm:foaf.descriptor}" />
+        <map:transform src="{lm:foaf.transform.foaf.foafExpandedSeeAlso}"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match pattern="personDetails/*.source.xml">
+        <map:generate type="file" src="{lm:foaf.descriptor.{1}}" />
+        <map:transform src="{lm:foaf.transform.foaf.foafExpandedSeeAlso}"/>
         <map:serialize type="xml"/>
       </map:match>
       <map:match pattern="personDetails.xml">
-        <map:generate src="cocoon:/personDetails/source.xml" />
+        <map:generate src="cocoon:/personDetails.source.xml" />
         <map:transform src="{lm:foaf.transform.foaf.document}"/>
         <map:serialize type="xml-document"/>
       </map:match>
-      <map:match pattern="people/person-**/source.xml">
-        <map:generate type="file" src="{lm:foaf.descriptor.{1}}" />
-        <map:serialize type="xml"/>
-      </map:match>
-      <map:match pattern="people/person-**.xml">
-        <map:generate src="cocoon:/people/person-{1}/source.xml" />
+      <map:match pattern="personDetails/*.xml">
+        <map:generate src="cocoon:/personDetails/{1}.source.xml" />
         <map:transform src="{lm:foaf.transform.foaf.document}"/>
         <map:serialize type="xml-document"/>
       </map:match>
-       <map:match pattern="people/index/source.xml">
+       <map:match pattern="personDetails/index.source.xml">
         <map:generate type="file" src="{lm:foaf.index}" />
         <map:serialize type="xml"/>
       </map:match>
-      <map:match pattern="people/index.xml">
-        <map:generate type="file" src="cocoon:/people/index/source.xml" />
+      <map:match pattern="personDetails/index.xml">
+        <map:generate type="file" src="cocoon:/personDetails/index.source.xml" 
/>
         <map:transform src="{lm:foaf.transform.foaf.index}"/>
         <map:serialize type="xml-document"/>
       </map:match>
-      <map:match pattern="personDetails/**.xml">
-        <map:generate src="cocoon:/people/person-{1}/source.xml" />
-        <map:transform src="{lm:foaf.transform.foaf.foafExpandedSeeAlso}"/>
+      <map:match pattern="personDetails/*.xml">
+        <map:generate src="cocoon:/personDetails/{1}.source.xml" />
         <map:transform src="{lm:foaf.transform.foaf.document}"/>
         <map:serialize type="xml-document"/> 
       </map:match>

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/index.xml?rev=574713&r1=574712&r2=574713&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/index.xml
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/index.xml
 Tue Sep 11 15:39:44 2007
@@ -36,7 +36,7 @@
             <p>Details of the default FOAF file for this website is currently 
             supported in the following formats.</p>
             <ul>
-               <li><a href="personDetails/source.xml">FOAF</a></li>
+               <li><a href="personDetails.source.xml">FOAF</a></li>
                <li><a href="personDetails.xml">XDoc</a></li>
                <li><a href="personDetails.html">HTML</a></li>
                <li><a href="personDetails.pdf">PDF</a></li>

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/site.xml?rev=574713&r1=574712&r2=574713&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/site.xml
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.foaf/src/documentation/content/xdocs/site.xml
 Tue Sep 11 15:39:44 2007
@@ -38,7 +38,7 @@
   </about>
   <samples label="Samples">
     <sample-1 label="Sample FOAF data" href="personDetails.html" 
description="Displays the FOAF data" />
-    <sample-2 label="Index of FOAF files" href="people/index.html" 
description="Aggregate FOAF files for viewing" />
+    <sample-2 label="Index of FOAF files" href="personDetails/index.html" 
description="Aggregate FOAF files for viewing" />
     <sample-2 label="Linking FOAF files" href="/index.html#sample-3" 
description="FOAF Auto-Discovery by Publishing and Linking FOAF files" />
   </samples>
 <!--