forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 56588 - in forrest/trunk: . etc main main/fresh-site/src/documentation/classes plugins/OpenOffice.org/docs/src/documentation/classes plugins/simplified-docbook/docs/src/documentation/classes
Date Thu, 04 Nov 2004 10:50:05 GMT
Author: cheche
Date: Thu Nov  4 02:50:03 2004
New Revision: 56588

Modified:
   forrest/trunk/etc/RELEASE_PROCESS.txt
   forrest/trunk/forrest.properties
   forrest/trunk/main/build.xml
   forrest/trunk/main/fresh-site/src/documentation/classes/CatalogManager.properties
   forrest/trunk/plugins/OpenOffice.org/docs/src/documentation/classes/CatalogManager.properties
   forrest/trunk/plugins/simplified-docbook/docs/src/documentation/classes/CatalogManager.properties
Log:
New Location


Modified: forrest/trunk/etc/RELEASE_PROCESS.txt
==============================================================================
--- forrest/trunk/etc/RELEASE_PROCESS.txt	(original)
+++ forrest/trunk/etc/RELEASE_PROCESS.txt	Thu Nov  4 02:50:03 2004
@@ -38,7 +38,7 @@
     <release version="0.7" date="2002-02-13">
       ...
 
- - Edit src/core/forrest.build.xml to update the version tag to remove "-dev".
+ - Edit main/forrest.build.xml to update the version tag to remove "-dev".
    There are two occurences:
    around line 29:
    <property name="version" value="0.7-dev"/>  
@@ -155,7 +155,7 @@
    around line 35:
    <property name="version" value="0.8-dev"/>  
 
- - Edit src/core/forrest.build.xml and update the version:
+ - Edit main/forrest.build.xml and update the version:
 
    around line 29:
    <property name="version" value="0.8-dev"/>  

Modified: forrest/trunk/forrest.properties
==============================================================================
--- forrest/trunk/forrest.properties	(original)
+++ forrest/trunk/forrest.properties	Thu Nov  4 02:50:03 2004
@@ -19,7 +19,7 @@
 project.name=forrest
 
 #project.skin=Don't specify a skin for Forrest, we will always use the 
-#             default one defined in src/core/context/default-forrest.properties
+#             default one defined in main/webapp/default-forrest.properties
 project.content-dir=/site
 project.xdocs-dir=${project.content-dir}/content/xdocs
 project.raw-content-dir=${project.content-dir}/content

Modified: forrest/trunk/main/build.xml
==============================================================================
--- forrest/trunk/main/build.xml	(original)
+++ forrest/trunk/main/build.xml	Thu Nov  4 02:50:03 2004
@@ -56,7 +56,7 @@
     <property name="tools.jar"             location="${java.home}/../lib/tools.jar"/>
     <available file="${tools.jar}"         property="tools.jar.present"/>
     
-    <property name="src-fresh-site"         location="src/core/fresh-site"/>
+    <property name="src-fresh-site"         location="main/fresh-site"/>
     
     <property name="forrestbot.dir"         location="../tools/forrestbot"/>
 
@@ -157,6 +157,7 @@
       </classpath>
     </taskdef>
     <!-- skinconf.xml -->
+    <!-- FIXME: do we need to validate skinconf.xml to build forrest? -->
     <echo message="validating **/skinconf.xml ..."/>
     <xmlvalidate failonerror="true" lenient="no" warn="yes">
       <xmlcatalog id="xcat">
@@ -165,13 +166,13 @@
             location="./webapp/resources/schema/catalog.xcat"/>
         </catalogpath>
       </xmlcatalog>
-      <fileset dir="./src/core"
+      <fileset dir="./site"
         includes="**/skinconf.xml" />
     </xmlvalidate>
     <!-- All stylesheets **/*.xsl -->
     <echo message="validating stylesheets **/*.xsl ..."/>
     <jing rngfile="./webapp/resources/schema/relaxng/xslt.rng">
-      <fileset dir="./src/core" includes="**/*.xsl"/>
+      <fileset dir="./main" includes="**/*.xsl"/>
       <fileset dir="${tools.dir}" includes="**/*.xsl"/>
     </jing>
     <!-- sitemap.xmap -->
@@ -208,9 +209,9 @@
     </copy>
         
     <!-- Fix bin/ permissions -->
-    <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/src/core/bin" includes="*.bat"/>
-    <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/src/core/bin" excludes="*.bat"/>
-    <chmod dir="${dist-shbat.dir}/src/core/bin" perm="ugo+rx" excludes="*.bat"/> 
+    <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/bin" includes="*.bat"/>
+    <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/bin" excludes="*.bat"/>
+    <chmod dir="${dist-shbat.dir}/bin" perm="ugo+rx" excludes="*.bat"/> 
 
     <!-- Fix ant/bin/ permissions -->
     <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/tools/ant/bin" includes="*.bat"/>
@@ -225,7 +226,7 @@
   | Please find it at: ${dist-shbat.dir}
   | Please copy the contents to the install directory of your choice
   | Please have the environment variable FORREST_HOME point to
-  |  ${dist-shbat.dir}/src/core
+  |  ${dist-shbat.dir}
   | It is recommended to add
   |    unix: $FORREST_HOME/bin: to your $PATH
   |    win: %FORREST_HOME%\bin; to your %PATH%
@@ -256,7 +257,7 @@
           description="Test that the features are okay before committing."/>
 
   <target name="testseed" depends="init">
-    <property name="forrest.home" location="src/core" />  
+    <property name="forrest.home" location="." />  
     <property name="test.dir" value="${build.dir}/test"/>
     <delete dir="${test.dir}"/>
     <mkdir dir="${test.dir}"/>
@@ -306,7 +307,7 @@
   | Installation notice 
   *-----------------------------------------------------------------
   | You have now built the ${forrest.version} version of Forrest.
-  | Please set the environment variable FORREST_HOME to point to src/core
+  | Please set the environment variable FORREST_HOME to point to .
   | It is recommended to add
   |    unix: $FORREST_HOME/bin: to your $PATH
   |    win: %FORREST_HOME%\bin; to your %PATH%

Modified: forrest/trunk/main/fresh-site/src/documentation/classes/CatalogManager.properties
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/classes/CatalogManager.properties	(original)
+++ forrest/trunk/main/fresh-site/src/documentation/classes/CatalogManager.properties	Thu
Nov  4 02:50:03 2004
@@ -28,7 +28,7 @@
 # The level of messages for status/debug (messages go to standard output).
 # The setting here is for your own local catalogs.
 # The verbosity of Forrest's core catalogs is controlled via
-#  forrestcore/src/core/context/WEB-INF/cocoon.xconf
+#  main/webapp/WEB-INF/cocoon.xconf
 #
 # The following messages are provided ...
 #  0 = none
@@ -41,7 +41,7 @@
 
 # catalogs ... list of additional catalogs to load
 #  (Note that Apache Forrest will automatically load its own default catalog
-#  from src/core/context/resources/schema/catalog.xcat)
+#  from main/webapp/resources/schema/catalog.xcat)
 # use full pathnames
 # pathname separator is always semi-colon (;) regardless of operating system
 # directory separator is always slash (/) regardless of operating system

Modified: forrest/trunk/plugins/OpenOffice.org/docs/src/documentation/classes/CatalogManager.properties
==============================================================================
--- forrest/trunk/plugins/OpenOffice.org/docs/src/documentation/classes/CatalogManager.properties
(original)
+++ forrest/trunk/plugins/OpenOffice.org/docs/src/documentation/classes/CatalogManager.properties
Thu Nov  4 02:50:03 2004
@@ -27,7 +27,7 @@
 
 # catalogs ... list of additional catalogs to load
 #  (Note that Apache Forrest will automatically load its own default catalog
-#  from src/core/context/resources/schema/catalog.xcat)
+#  from main/webapp/resources/schema/catalog.xcat)
 # use full pathnames
 # pathname separator is always semi-colon (;) regardless of operating system
 # directory separator is always slash (/) regardless of operating system

Modified: forrest/trunk/plugins/simplified-docbook/docs/src/documentation/classes/CatalogManager.properties
==============================================================================
--- forrest/trunk/plugins/simplified-docbook/docs/src/documentation/classes/CatalogManager.properties
(original)
+++ forrest/trunk/plugins/simplified-docbook/docs/src/documentation/classes/CatalogManager.properties
Thu Nov  4 02:50:03 2004
@@ -27,7 +27,7 @@
 
 # catalogs ... list of additional catalogs to load
 #  (Note that Apache Forrest will automatically load its own default catalog
-#  from src/core/context/resources/schema/catalog.xcat)
+#  from main/webapp/resources/schema/catalog.xcat)
 # use full pathnames
 # pathname separator is always semi-colon (;) regardless of operating system
 # directory separator is always slash (/) regardless of operating system

Mime
View raw message