forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 20891 - in forrest/trunk: . src/core src/core/targets
Date Mon, 07 Jun 2004 21:36:43 GMT
Author: cheche
Date: Mon Jun  7 14:36:42 2004
New Revision: 20891

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/context.xml
   forrest/trunk/src/core/targets/site.xml
   forrest/trunk/src/core/targets/webapp.xml
   forrest/trunk/status.xml
Log:
Lucene-index target works. If search@provider="lucene" is set create a search index.
Build site and run targets as per project directory instead of forrest.home.


Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Mon Jun  7 14:36:42 2004
@@ -105,14 +105,13 @@
     <property name="project.site-dir"    location="${project.build-dir}/site"    />
     <property name="project.war"         location="${project.build-dir}/${project.name}.war"
/>
     <property name="project.webapp"      location="${project.build-dir}/webapp" />
-    <property name="project.index-dir"   location="${project.webapp}/lucene-index" />
 
     <property name="project.temp-dir"           location="${project.build-dir}/tmp"  
  />
     <property name="project.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"
     />
     
     <property name="project.brokenlinkfile" location="${project.build-dir}/brokenlinks.xml"/>
-    <property name="project.configfile"     value="${forrest.home}/context/WEB-INF/cli.xconf"
/>
-    <property name="project.logkitfile"     value="${forrest.home}/context/WEB-INF/logkit.xconf"
/>
+    <property name="project.configfile"     value="${project.webapp}/WEB-INF/cli.xconf"
/>
+    <property name="project.logkitfile"     value="${project.webapp}/WEB-INF/logkit.xconf"
/>
     <property name="project.logger"         value="debug" />
 
     <property name="status"      location="${project.home}/${project.status}" />
@@ -145,7 +144,7 @@
     <!-- These are used by Forrest to resolve all other values -->
     <property name="forrest.basic.jvmargs" value="-Dproject.home=&quot;${project.home}&quot;
-Dforrest.home=&quot;${forrest.home}&quot;"/>
     <echo>forrest.basic.jvmargs:${forrest.basic.jvmargs}</echo>
-        
+
     <!-- echo settings in -Dforrest.echo=true mode -->
     <antcall target="echo-settings" />
   </target>
@@ -187,6 +186,9 @@
     <property name="skinfilters" value="${project.temp-dir}/skinfilters.properties"/>
     <echoproperties prefix="skinconfig" destfile="${skinfilters}"/>
     <filter filtersfile="${skinfilters}"/>
+    <condition property="use-lucene-indexer">
+        <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
+    </condition>
   </target>
 
   <!-- Sets up properties and filters -->
@@ -312,7 +314,7 @@
 
 
   <target name="run" 
-   depends="init, run_custom_jetty, run_default_jetty"/>
+   depends="init, webapp-local, run_custom_jetty, run_default_jetty"/>
  
   <target name="run_custom_jetty"
    if="custom_jetty_config"
@@ -336,7 +338,7 @@
   <target name="run_default_jetty"
    description="Run Jetty with configuration file found in Forrest">
     <java classname="org.mortbay.jetty.Server"
-          dir="${forrest.home}/context"
+          dir="${project.webapp}"
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">

Modified: forrest/trunk/src/core/targets/context.xml
==============================================================================
--- forrest/trunk/src/core/targets/context.xml	(original)
+++ forrest/trunk/src/core/targets/context.xml	Mon Jun  7 14:36:42 2004
@@ -147,22 +147,21 @@
   <!-- ===============================================================
        Prepares the Lucene context indexing the site. 
        =============================================================== -->
-  <target name="lucene-index">
+  <target name="lucene-index" depends="init-skinprops" if="use-lucene-indexer">
    <java classname="org.apache.cocoon.Main"
-        fork="true"
         dir="${project.webapp}"
+        fork="true"
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
         <jvmarg line="${forrest.jvmargs}"/>
         <jvmarg line="${forrest.basic.jvmargs}"/>
-        <jvmarg value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
+        <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
         <arg value="--logLevel=${project.debuglevel}"/>
         <arg value="--Logger=${project.logger}"/>
         <arg value="--logKitconfig=${project.logkitfile}"/>
-        <arg value="--destDir=${project.temp-dir}"/>
+        <arg value="--destDir=${project.site-dir}"/>
         <arg value="--xconf=${project.configfile}"/>
         <arg value="--followLinks=false"/>
-        <arg value="-w${project.cocoon-work-dir}"/>
         <arg value="lucene-update.html"/>
         <classpath>
           <path refid="forrest.cp"/>

Modified: forrest/trunk/src/core/targets/site.xml
==============================================================================
--- forrest/trunk/src/core/targets/site.xml	(original)
+++ forrest/trunk/src/core/targets/site.xml	Mon Jun  7 14:36:42 2004
@@ -28,7 +28,7 @@
        ===============================================================
    -->
 
-   <target name="site" depends="init, -prepare-classpath, check-contentdir" 
+   <target name="site" depends="init, prepare-context, -prepare-classpath, check-contentdir"

                        if="project.content.present"
                        description="Generates a static HTML website for this project">
     <!-- clean out the temp space, if we don't cocoon fails on this.
@@ -37,10 +37,9 @@
     <mkdir dir="${project.cocoon-work-dir}"/>
 
     <parallel>
-<!-- dir="${project.webapp}" -->
       <java classname="org.apache.cocoon.Main"
         fork="true"
-        dir="${forrest.home}/context"  
+        dir="${project.webapp}"  
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
         <jvmarg line="${forrest.jvmargs}"/>

Modified: forrest/trunk/src/core/targets/webapp.xml
==============================================================================
--- forrest/trunk/src/core/targets/webapp.xml	(original)
+++ forrest/trunk/src/core/targets/webapp.xml	Mon Jun  7 14:36:42 2004
@@ -48,16 +48,10 @@
 -->
     
     <!-- Prepare the Lucene search index -->
-    <!-- FIXME: There must be a better way to configure this.
-         Is this really a concern of the skinconf?
-         The indexer must be off by default. If the optional skinconf parameter
-         "disable-lucene" is missing or false, then off. 
     <condition property="use-lucene-indexer">
-        <isset property="skinconfig.search(provider)"/>
-        <equals arg1="${skinconfig.search(provider)}" arg2="lucene"/>
+        <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
     </condition>
-    <antcall target="lucene-index"/>
-    -->
+    <antcall target="lucene-index" />
 
     <available file="${content-dir}/jettyconf.xml" 
       property="custom_jetty_config"/>

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Mon Jun  7 14:36:42 2004
@@ -49,6 +49,10 @@
         Added new document to facilitate
         <link href="upgrading_06.html">upgrading to v0.6</link>
       </action>
+      <action dev="JJP" type="fix" context="code">
+        Lucene-index target works. If search@provider="lucene" is set create a search index.
+        Build site and run targets as per project directory instead of forrest.home.
+      </action>
       <action dev="DB" type="update" context="code" fixes-bug="FOR-148">
          Fix relative links and image references in aggregate pages.
       </action>

Mime
View raw message