forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r294994 - in /forrest/trunk/main/webapp: locationmap-search.xml locationmap.xml search.xmap
Date Wed, 05 Oct 2005 05:31:09 GMT
Author: crossley
Date: Tue Oct  4 22:31:03 2005
New Revision: 294994

URL: http://svn.apache.org/viewcvs?rev=294994&view=rev
Log:
Commence moving to locationmap (FOR-695).

Added:
    forrest/trunk/main/webapp/locationmap-search.xml
      - copied, changed from r294964, forrest/trunk/main/webapp/locationmap-skinconf.xml
Modified:
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/main/webapp/search.xmap

Copied: forrest/trunk/main/webapp/locationmap-search.xml (from r294964, forrest/trunk/main/webapp/locationmap-skinconf.xml)
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-search.xml?p2=forrest/trunk/main/webapp/locationmap-search.xml&p1=forrest/trunk/main/webapp/locationmap-skinconf.xml&r1=294964&r2=294994&rev=294994&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skinconf.xml (original)
+++ forrest/trunk/main/webapp/locationmap-search.xml Tue Oct  4 22:31:03 2005
@@ -31,29 +31,20 @@
                     src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
+
   <locator>
-    
-    <!-- FIXME: skinconf.project is a duplicate of project.skinconf -->
-    <match pattern="skinconf.project">
-      <location src="{project:skinconf}" />
+
+    <match pattern="transform.lucene-search.xdoc">
+      <location src="{forrest:stylesheets}/search/search2document.xsl" />
     </match>
-  
-    <match pattern="project.skinconf">
-        <location src="{project:skinconf}" />
+
+    <match pattern="transform.lucene-update.xdoc">
+      <location src="{forrest:stylesheets}/search/lucene-update2document.xsl" />
     </match>
-    
-    <match pattern="project-skinconf.xsl">
-        <location src="{project:skins-dir}{forrest:skin}/skinconf.xsl" />
+
+    <match pattern="transform.xdoc.lucene">
+      <location src="{forrest:stylesheets}/search/document2lucene.xsl" />
     </match>
-    
-    <match pattern="forrest-skinconf.xsl">
-        <location src="{forrest:context}/skins/{forrest:skin}/skinconf.xsl" />
-    </match>
-    
-    <match pattern="common-skinconf.xsl">
-        <location src="{forrest:context}/skins/common/skinconf.xsl" />
-    </match>
-    
+
   </locator>
 </locationmap>

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=294994&r1=294993&r2=294994&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Tue Oct  4 22:31:03 2005
@@ -68,6 +68,11 @@
     <select>
       <mount src="{forrest:context}/locationmap-issues.xml"/>
     </select>
+
+    <!--  FIXME: not sure where to put these lucene ones -->
+    <select>
+      <mount src="{forrest:context}/locationmap-search.xml"/>
+    </select>
     
     <!-- ================================== -->
     <!-- project files                      -->

Modified: forrest/trunk/main/webapp/search.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/search.xmap?rev=294994&r1=294993&r2=294994&view=diff
==============================================================================
--- forrest/trunk/main/webapp/search.xmap (original)
+++ forrest/trunk/main/webapp/search.xmap Tue Oct  4 22:31:03 2005
@@ -73,7 +73,7 @@
       <map:match pattern="lucene-update.xml">
         <map:generate src="cocoon:/site.lucene"/>
         <map:transform type="index"/>
-        <map:transform src="{forrest:stylesheets}/search/lucene-update2document.xsl"/>
+        <map:transform src="{lm:transform.lucene-update.xdoc}"/>
         <map:serialize type="xml"/>
       </map:match>
 
@@ -91,8 +91,7 @@
           <map:parameter name="query-string" value="queryString"/>
         </map:generate>
 
-        <map:transform
-        src="{forrest:stylesheets}/search/search2document.xsl"/>
+        <map:transform src="{lm:transform.lucene-search.xdoc}"/>
 
         <map:serialize type="xml"/>
       </map:match>
@@ -129,7 +128,7 @@
             <map:generate src="cocoon://{1}{2}.xml"/>
           </map:when>
         </map:select>
-        <map:transform src="{forrest:stylesheets}/search/document2lucene.xsl">
+        <map:transform src="{lm:transform.xdoc.lucene}">
           <map:parameter name="document-url" value="{1}{2}.xml"/>
         </map:transform>
         <map:serialize type="xml"/>



Mime
View raw message