svn commit: rev 36634 - in forrest/trunk/src/core: . context context/WEB-INF

[br...@apache.org]

Author: brondsem
Date: Thu Aug 19 13:51:40 2004
New Revision: 36634

Modified:
   forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
   forrest/trunk/src/core/context/default-forrest.properties
   forrest/trunk/src/core/context/sitemap.xmap
   forrest/trunk/src/core/forrest.build.xml
Log:
put info.xml file in a project directory instead of forrest directory

Modified: forrest/trunk/src/core/context/WEB-INF/cocoon.xconf
==============================================================================
--- forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	(original)
+++ forrest/trunk/src/core/context/WEB-INF/cocoon.xconf	Thu Aug 19 13:51:40 2004
@@ -128,6 +128,7 @@
         <resources.stylesheets>@project.home@/@project.stylesheets-dir@/</resources.stylesheets>
         <resources.images>@project.home@/@project.images-dir@/</resources.images>
         <skins-dir>@project.home@/@project.skins-dir@/</skins-dir>
+        <temp-dir>@project.temp-dir@</temp-dir>
       </values>
     </component-instance>
 

Modified: forrest/trunk/src/core/context/default-forrest.properties
==============================================================================
--- forrest/trunk/src/core/context/default-forrest.properties	(original)
+++ forrest/trunk/src/core/context/default-forrest.properties	Thu Aug 19 13:51:40 2004
@@ -61,6 +61,9 @@
 project.classes-dir=${project.content-dir}/classes
 project.translations-dir=${project.content-dir}/translations
 
+project.build-dir=${project.home}/build
+project.temp-dir=${project.build-dir}/tmp
+
 
 ##############
 # Cocoon catalog entity resolver properties

Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ forrest/trunk/src/core/context/sitemap.xmap	Thu Aug 19 13:51:40 2004
@@ -254,7 +254,7 @@
 
          <!-- Add some project info -->
          <map:match pattern="info">
-           <map:generate src="{forrest:context}/WEB-INF/info.xml"/>
+           <map:generate src="{project:temp-dir}/info.xml"/>
            <map:serialize type="xml"/>
          </map:match>
        </map:pipeline>

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Thu Aug 19 13:51:40 2004
@@ -98,12 +98,10 @@
     <!-- people should use forrest.properties to override following defaults  -->
     <property name="forrest.home"        location="." />
     <property name="forrest.skins-dir"   location="${forrest.home}/context/skins"/>   
-    <property name="project.build-dir"   location="${project.home}/build"    />
     <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.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.temp-dir}/brokenlinks.xml"/>
@@ -202,7 +200,7 @@
     <tstamp prefix="generate">
       <format property="timestamp" timezone="en" pattern="yyyy-MM-dd'T'HH:mm'Z'"/>
     </tstamp>
-    <echo file="${forrest.home}/context/WEB-INF/info.xml">&lt;info>
+    <echo file="${project.temp-dir}/info.xml">&lt;info>
   &lt;project-skin>${project.skin}&lt;/project-skin>
   &lt;forrest-version>${version}&lt;/forrest-version>
   &lt;generate-timestamp>${generate.timestamp}&lt;/generate-timestamp>