forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: r109808 - in forrest/trunk: bin main main/targets
Date Sat, 04 Dec 2004 15:45:42 GMT
Author: cheche
Date: Sat Dec  4 07:45:41 2004
New Revision: 109808

URL: http://svn.apache.org/viewcvs?view=rev&rev=109808
Log:
Cleaning up big mess so forrest.home is not longer forrest.home/main
forrest.home/main --> forrest.core

Modified:
   forrest/trunk/bin/forrest
   forrest/trunk/bin/forrest.bat
   forrest/trunk/main/forrest.build.xml
   forrest/trunk/main/targets/context.xml
   forrest/trunk/main/targets/plugins.xml
   forrest/trunk/main/targets/site.xml
   forrest/trunk/main/targets/skins.xml
   forrest/trunk/main/targets/validate.xml
   forrest/trunk/main/targets/webapp.xml

Modified: forrest/trunk/bin/forrest
Url: http://svn.apache.org/viewcvs/forrest/trunk/bin/forrest?view=diff&rev=109808&p1=forrest/trunk/bin/forrest&r1=109807&p2=forrest/trunk/bin/forrest&r2=109808
==============================================================================
--- forrest/trunk/bin/forrest	(original)
+++ forrest/trunk/bin/forrest	Sat Dec  4 07:45:41 2004
@@ -92,7 +92,7 @@
 
 echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
 echo
-FORREST_HOME="$FORREST_HOME" "$ANT_HOME/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME"
-Dforrest.home="$FORREST_DOT_HOME/main" -emacs $@
+FORREST_HOME="$FORREST_HOME" "$ANT_HOME/bin/ant" -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME"
-emacs $@
 RESULT=$?
 
 # ---- Restore Classpath

Modified: forrest/trunk/bin/forrest.bat
Url: http://svn.apache.org/viewcvs/forrest/trunk/bin/forrest.bat?view=diff&rev=109808&p1=forrest/trunk/bin/forrest.bat&r1=109807&p2=forrest/trunk/bin/forrest.bat&r2=109808
==============================================================================
--- forrest/trunk/bin/forrest.bat	(original)
+++ forrest/trunk/bin/forrest.bat	Sat Dec  4 07:45:41 2004
@@ -47,7 +47,7 @@
 echo.
 rem ----- call ant.. ---------------------------------------------------
 echo.
-call "%ANT_HOME%\bin\forrestant" -buildfile "%ANTFILE%" -Dbasedir="%PROJECT_HOME%" -Dforrest.home="%FORREST_HOME%\main"
-emacs -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%ANT_HOME%\bin\forrestant" -buildfile "%ANTFILE%" -Dbasedir="%PROJECT_HOME%" -emacs
-logger org.apache.tools.ant.NoBannerLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem ---- Restore old ANT_HOME
 set ANT_HOME=%OLD_ANT_HOME%

Modified: forrest/trunk/main/forrest.build.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?view=diff&rev=109808&p1=forrest/trunk/main/forrest.build.xml&r1=109807&p2=forrest/trunk/main/forrest.build.xml&r2=109808
==============================================================================
--- forrest/trunk/main/forrest.build.xml	(original)
+++ forrest/trunk/main/forrest.build.xml	Sat Dec  4 07:45:41 2004
@@ -26,19 +26,22 @@
 
 <project default="site" basedir="." name="forrest">
 
-  <property name="forrest.version" value="0.7-dev"/>
-  <property name="forrest.home"        		  location="${basedir}" />
-  <property name="forrest.root-dir"           location="${forrest.home}/.."/>
+  <property environment="env" />
+  <property name="forrest.home"               location="${env.FORREST_HOME}" />
+  <property name="forrest.version"            value="0.7-dev"/>
 
-  <property name="forrest.lib-dir"            location="${forrest.root-dir}/lib"/>
+  <property name="forrest.lib-dir"            location="${forrest.home}/lib"/>
   <property name="forrest.core.lib-dir"       location="${forrest.lib-dir}/core"/>
   <property name="forrest.endorsed.lib-dir"   location="${forrest.lib-dir}/endorsed"/>
   <property name="forrest.optional.lib-dir"   location="${forrest.lib-dir}/optional"/>
 
-  <property name="forrest.ant.lib-dir"        location="${forrest.root-dir}/tools/ant/lib"/>
-  <property name="forrest.jetty.lib-dir"      location="${forrest.root-dir}/tools/jetty"/>
+  <property name="forrest.ant.lib-dir"        location="${forrest.home}/tools/ant/lib"/>
+  <property name="forrest.jetty.lib-dir"      location="${forrest.home}/tools/jetty"/>
 
-  <property name="forrest.build.lib-dir"      location="${forrest.root-dir}/build"/>
+  <property name="forrest.build.lib-dir"      location="${forrest.home}/build"/>
+  
+  <property name="forrest.core"               location="${forrest.home}/main"/>
+  <property name="forrest.core.webapp"        location="${forrest.core}/webapp"/>
 
   <import file="targets/validate.xml"/>
   <import file="targets/webapp.xml"/>
@@ -94,20 +97,20 @@
     <echo message="Loading user specific properties from ${user.home}${/}forrest.properties"
/>
     <property file="${user.home}/forrest.properties" />
     <echo message="Loading default properties from ${forrest.home}${/}webapp${/}default-forrest.properties"
/>
-    <property file="${forrest.home}/webapp/default-forrest.properties" />
+    <property file="${forrest.core.webapp}/default-forrest.properties" />
 
     <!-- people should use forrest.properties to override following defaults  -->
-    <property name="forrest.skins-dir"   location="${forrest.home}/webapp/skins"/>
-    <property name="forrest.plugins-dir"   location="${forrest.root-dir}/build/plugins"/>
-    <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="forrest.skins-dir"     location="${forrest.core.webapp}/skins"/>
+    <property name="forrest.plugins-dir"   location="${forrest.home}/build/plugins"/>
+    <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.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"
     />
 
     <property name="project.brokenlinkfile" location="${project.temp-dir}/brokenlinks.xml"/>
-    <property name="project.configfile"     value="${forrest.home}/webapp/WEB-INF/cli.xconf"
/>
-    <property name="project.logkitfile"     value="${forrest.home}/webapp/WEB-INF/logkit.xconf"
/>
+    <property name="project.configfile"     value="${forrest.core.webapp}/WEB-INF/cli.xconf"
/>
+    <property name="project.logkitfile"     value="${forrest.core.webapp}/WEB-INF/logkit.xconf"
/>
     <property name="project.logger"         value="debug" />
 
     <property name="status"      location="${project.home}/${project.status}" />
@@ -261,7 +264,7 @@
   <target name="load-project-props" depends="validation-props, prepare-context" if="skinconf.present">
     <xslt in="${skinconf}"
           out="${project.temp-dir}/no-doctype-project-skinconf.xml"
-          style="${forrest.home}/webapp/resources/stylesheets/strip-doctype.xsl">
+          style="${forrest.core.webapp}/resources/stylesheets/strip-doctype.xsl">
         <xmlcatalog refid="fcatalog"/>
     </xslt>
 
@@ -271,9 +274,9 @@
 
   <!-- Load properties from Forrest's default skinconf.xml, unless a user's is defined
-->
   <target name="load-forrest-props" unless="skinconf.present">
-     <xslt in="${forrest.home}/webapp/skinconf.xml"
+     <xslt in="${forrest.core.webapp}/skinconf.xml"
            out="${project.temp-dir}/no-doctype-forrest-skinconf.xml"
-           style="${forrest.home}/webapp/resources/stylesheets/strip-doctype.xsl">
+           style="${forrest.core.webapp}/resources/stylesheets/strip-doctype.xsl">
         <xmlcatalog refid="fcatalog"/>
     </xslt>
 
@@ -319,7 +322,7 @@
        Echo's the settings if requested. [-Dforrest.echo=true]
        =============================================================== -->
   <target name="echo-settings" if="forrest.echo">
-    <loadfile property="echo-settings-message" srcFile="${forrest.home}/var/echo-settings-message.txt">
+    <loadfile property="echo-settings-message" srcFile="${forrest.core}/var/echo-settings-message.txt">
        <filterchain><expandproperties/></filterchain>
     </loadfile>
     <echo>${echo-settings-message}</echo>
@@ -333,7 +336,7 @@
   <target name="-prepare-classpath">
     <path id="forrest.cp">
          <pathelement path="${env.CLASSPATH}" />
-         <pathelement location="${forrest.home}/webapp/WEB-INF/classes"/>
+         <pathelement location="${forrest.core.webapp}/WEB-INF/classes"/>
          <pathelement location="${forrest.build.lib-dir}/xml-forrest.jar"/>
          <pathelement location="${project.classes-dir}"/>
          <fileset dir="${forrest.jetty.lib-dir}" casesensitive="no">
@@ -401,9 +404,9 @@
   <target name="seed" depends="ensure-nocontent"
     description="* Seeds a directory with a template project doc structure">
      <copy todir="${project.home}" overwrite="false">
-        <fileset dir="${forrest.home}/fresh-site"/>
+        <fileset dir="${forrest.core}/fresh-site"/>
      </copy>
-     <loadfile  property="template-project-created-message" srcFile="${forrest.home}/var/template-project-created-message.txt">
+     <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message.txt">
         <filterchain><expandproperties/></filterchain>
     </loadfile>
     <echo>${template-project-created-message}</echo>
@@ -429,7 +432,7 @@
    if="custom_jetty_config"
    description="Run Jetty with configuration file found in the project">
     <java classname="org.mortbay.jetty.Server"
-          dir="${forrest.home}/webapp"
+          dir="${forrest.core.webapp}"
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
@@ -450,7 +453,7 @@
   <target name="run_default_jetty"
    description="Run Jetty with configuration file found in Forrest">
     <java classname="org.mortbay.jetty.Server"
-          dir="${forrest.home}/webapp"
+          dir="${forrest.core.webapp}"
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
@@ -460,7 +463,7 @@
        <jvmarg line="${forrest.jvmargs}"/>
        <jvmarg
          value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.endorsed.lib-dir}"/>
-       <arg line="${forrest.home}/webapp/jettyconf.xml" />
+       <arg line="${forrest.core.webapp}/jettyconf.xml" />
        <syspropertyset>
          <propertyref prefix="forrest."/>
          <propertyref prefix="project."/>

Modified: forrest/trunk/main/targets/context.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/context.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/context.xml&r1=109807&p2=forrest/trunk/main/targets/context.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/context.xml	(original)
+++ forrest/trunk/main/targets/context.xml	Sat Dec  4 07:45:41 2004
@@ -45,8 +45,8 @@
 
     <mkdir dir="${project.webapp}"/>
 
-    <sync todir="${project.webapp}/">
-      <fileset dir="${forrest.home}/webapp" >
+    <sync todir="${project.webapp}">
+      <fileset dir="${forrest.core.webapp}" >
         <include name="**" />
       </fileset>
     </sync>

Modified: forrest/trunk/main/targets/plugins.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/plugins.xml&r1=109807&p2=forrest/trunk/main/targets/plugins.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/plugins.xml	(original)
+++ forrest/trunk/main/targets/plugins.xml	Sat Dec  4 07:45:41 2004
@@ -28,7 +28,7 @@
       <sequential>
         <xslt in="@{plugin-descriptor-file}" 
           out="${project.temp-dir}/pluginlist2echobuild.xml"
-          style="${forrest.home}/var/pluginlist2echo.xsl"/>  
+          style="${forrest.core}/var/pluginlist2echo.xsl"/>  
     <ant antfile="${project.temp-dir}/pluginlist2echobuild.xml"/>
       </sequential>
     </for>
@@ -84,7 +84,7 @@
      <echo>Mounting input plugin: ${plugin-name}</echo>
      <xslt in="${forrest.plugins-dir}/input.xmap"
        out="${forrest.plugins-dir}/input.xmap.new"
-       style="${forrest.home}/var/pluginMountSnippet.xsl"
+       style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="input"/>  
@@ -93,7 +93,7 @@
        tofile="${forrest.plugins-dir}/input.xmap"/>
      <xslt in="${forrest.plugins-dir}/resources.xmap"
        out="${forrest.plugins-dir}/resources.xmap.new"
-       style="${forrest.home}/var/pluginMountSnippet.xsl"
+       style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="resources"/>  
@@ -110,7 +110,7 @@
      <echo>Mounting output plugin: ${plugin.name}</echo>
      <xslt in="${forrest.plugins-dir}/output.xmap"
        out="${forrest.plugins-dir}/output.xmap.new"
-       style="${forrest.home}/var/pluginMountSnippet.xsl"
+       style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="output"/>  
@@ -127,7 +127,7 @@
      <echo>Mounting internals plugin: ${plugin-name}</echo>
      <xslt in="${forrest.plugins-dir}/internal.xmap"
        out="${forrest.plugins-dir}/internal.xmap.new"
-       style="${forrest.home}/var/pluginMountSnippet.xsl"
+       style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
            <param name="plugin-name" expression="${plugin.name}"/>  
            <param name="plugin-type" expression="internal"/>  
@@ -163,7 +163,7 @@
       <sequential>
         <xslt in="@{plugin-descriptor-file}" 
           out="${project.temp-dir}/pluginlist2fetchbuild.xml"
-          style="${forrest.home}/var/pluginlist2fetch.xsl"
+          style="${forrest.core}/var/pluginlist2fetch.xsl"
           force="true">
           <param name="plugin-name" expression="${plugin.name}"/>  
           <param name="plugin-dir" expression="${forrest.plugins-dir}/"/>      
@@ -180,16 +180,16 @@
     description="ensure the required plugins are available locally, if any are not download
them automatically">
     
     <mkdir dir="${forrest.plugins-dir}"/>
-    <copy file="${forrest.home}/var/initial_plugins_sitemap.xmap"
+    <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${forrest.plugins-dir}/input.xmap"
       overwrite="true"/>
-    <copy file="${forrest.home}/var/initial_plugins_sitemap.xmap"
+    <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${forrest.plugins-dir}/resources.xmap"
       overwrite="true"/>
-    <copy file="${forrest.home}/var/initial_plugins_sitemap.xmap"
+    <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${forrest.plugins-dir}/output.xmap"
       overwrite="true"/>
-    <copy file="${forrest.home}/var/initial_plugins_sitemap.xmap"
+    <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${forrest.plugins-dir}/internal.xmap"
       overwrite="true"/>
     

Modified: forrest/trunk/main/targets/site.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/site.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/site.xml&r1=109807&p2=forrest/trunk/main/targets/site.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/site.xml	(original)
+++ forrest/trunk/main/targets/site.xml	Sat Dec  4 07:45:41 2004
@@ -35,7 +35,7 @@
     <parallel>
       <java classname="org.apache.cocoon.Main"
         fork="true"
-        dir="${forrest.home}/webapp"  
+        dir="${forrest.core.webapp}"  
         maxmemory="${forrest.maxmemory}"
         failonerror="true">
         <jvmarg line="${forrest.jvmargs}"/>

Modified: forrest/trunk/main/targets/skins.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/skins.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/skins.xml&r1=109807&p2=forrest/trunk/main/targets/skins.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/skins.xml	(original)
+++ forrest/trunk/main/targets/skins.xml	Sat Dec  4 07:45:41 2004
@@ -28,7 +28,7 @@
       <sequential>
         <xslt in="@{skin-descriptor-file}" 
           out="${project.temp-dir}/skinlist2echobuild.xml"
-          style="${forrest.home}/var/skinlist2echo.xsl"/>  
+          style="${forrest.core}/var/skinlist2echo.xsl"/>  
     <ant antfile="${project.temp-dir}/skinlist2echobuild.xml"/>
       </sequential>
     </for>
@@ -111,7 +111,7 @@
       <sequential>
         <xslt in="@{skin-descriptor-file}" 
           out="${project.temp-dir}/skinlist2fetchbuild.xml"
-          style="${forrest.home}/var/skinlist2fetch.xsl"
+          style="${forrest.core}/var/skinlist2fetch.xsl"
           force="true">
       <param name="skin-name" expression="${project.skin}"/>      
       <param name="forrest-version" expression="${forrest.version}"/>   

Modified: forrest/trunk/main/targets/validate.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/validate.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/validate.xml&r1=109807&p2=forrest/trunk/main/targets/validate.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/validate.xml	(original)
+++ forrest/trunk/main/targets/validate.xml	Sat Dec  4 07:45:41 2004
@@ -127,7 +127,7 @@
       <xmlcatalog id="fcatalog" >
         <catalogpath>
           <pathelement
-            location="${forrest.home}/webapp/resources/schema/catalog.xcat"/>
+            location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
           <pathelement location="${catalog}"/>
         </catalogpath>
       </xmlcatalog>
@@ -164,7 +164,7 @@
 
   <target name="validate-sitemap" depends="validation-props"
     if="validate.sitemap" description="Validate the project sitemap">
-    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/sitemap-v06.rng">
+    <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/sitemap-v06.rng">
       <fileset dir="${content-dir}"
         includes="${forrest.validate.sitemap.includes}"
         excludes="${forrest.validate.sitemap.excludes}">
@@ -176,7 +176,7 @@
 
   <target name="validate-stylesheets" depends="validation-props"
     if="validate.stylesheets" description="Validate XSL files">
-    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/xslt.rng">
+    <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/xslt.rng">
       <fileset dir="${stylesheets-dir}"
         includes="${forrest.validate.stylesheets.includes}"
         excludes="${forrest.validate.stylesheets.excludes}" />
@@ -188,7 +188,7 @@
 
   <target name="validate-skins-stylesheets" depends="validation-props"
     if="validate.skins.stylesheets">
-    <jing rngfile="${forrest.home}/webapp/resources/schema/relaxng/xslt.rng">
+    <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/xslt.rng">
       <fileset dir="${skins-dir}"
         includes="${forrest.validate.skins.stylesheets.includes}"
         excludes="${forrest.validate.skins.stylesheets.excludes}"/>
@@ -205,7 +205,7 @@
       </available>
     </condition>
 
-    <loadfile property="skin-not-found-message" srcFile="${forrest.home}/var/skin-not-found-message.txt">
+    <loadfile property="skin-not-found-message" srcFile="${forrest.core}/var/skin-not-found-message.txt">
       <filterchain><expandproperties/></filterchain>
     </loadfile>
       

Modified: forrest/trunk/main/targets/webapp.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/webapp.xml?view=diff&rev=109808&p1=forrest/trunk/main/targets/webapp.xml&r1=109807&p2=forrest/trunk/main/targets/webapp.xml&r2=109808
==============================================================================
--- forrest/trunk/main/targets/webapp.xml	(original)
+++ forrest/trunk/main/targets/webapp.xml	Sat Dec  4 07:45:41 2004
@@ -41,7 +41,7 @@
     extra project-custom classes then will need to be warred in as well. -->
 <!--  should be already there
     <mkdir dir="${project.webapp}/WEB-INF"/>
-    <copy file="${forrest.home}/webapp/WEB-INF/web.xml" filtering="true" 
+    <copy file="${forrest.core.webapp}/WEB-INF/web.xml" filtering="true" 
       todir="${project.webapp}/WEB-INF"/>
 -->
     
@@ -54,7 +54,7 @@
     <available file="${content-dir}/jettyconf.xml" 
       property="custom_jetty_config"/>
 
-    <loadfile  property="webapp-local-generated-message" srcFile="${forrest.home}/var/webapp-local-generated-message.txt">
+    <loadfile  property="webapp-local-generated-message" srcFile="${forrest.core}/var/webapp-local-generated-message.txt">
         <filterchain><expandproperties/></filterchain>
     </loadfile>
     <echo>${webapp-local-generated-message}</echo>
@@ -103,7 +103,7 @@
     </copy>
                   
     <copy toDir="${project.webapp}/WEB-INF/classes">
-      <fileset dir="${forrest.home}/webapp/WEB-INF/classes"/>
+      <fileset dir="${forrest.core.webapp}/WEB-INF/classes"/>
     </copy>
 
     <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
@@ -131,7 +131,7 @@
       file="${project.temp-dir}/build-info.xml"/>
 
     <loadfile  property="webapp-generated-message" 
-      srcFile="${forrest.home}/var/webapp-generated-message.txt">
+      srcFile="${forrest.core}/var/webapp-generated-message.txt">
         <filterchain><expandproperties/></filterchain>
     </loadfile>
     <echo>${webapp-generated-message}</echo>

Mime
View raw message