You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2005/05/09 12:42:10 UTC

svn commit: r169271 - in /myfaces/trunk: build/build-site.xml build/build.default.properties build/build.xml build/forrest.local.properties.sample forrest.properties

Author: manolito
Date: Mon May  9 03:42:08 2005
New Revision: 169271

URL: http://svn.apache.org/viewcvs?rev=169271&view=rev
Log:
further adaptions of site build

Removed:
    myfaces/trunk/build/forrest.local.properties.sample
Modified:
    myfaces/trunk/build/build-site.xml
    myfaces/trunk/build/build.default.properties
    myfaces/trunk/build/build.xml
    myfaces/trunk/forrest.properties

Modified: myfaces/trunk/build/build-site.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/build-site.xml?rev=169271&r1=169270&r2=169271&view=diff
==============================================================================
--- myfaces/trunk/build/build-site.xml (original)
+++ myfaces/trunk/build/build-site.xml Mon May  9 03:42:08 2005
@@ -7,8 +7,9 @@
       * FORREST_HOME must be set as an environment variable
      -->
 
-    <property environment="env"/>
-    <property name="forrest.home" value="${env.FORREST_HOME}"/>
+     <property environment="env"/>
+
+     <property name="forrest.home" value="${env.FORREST_HOME}"/>
 
     <import file="${env.FORREST_HOME}/forrest.build.xml"/>
 

Modified: myfaces/trunk/build/build.default.properties
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/build.default.properties?rev=169271&r1=169270&r2=169271&view=diff
==============================================================================
--- myfaces/trunk/build/build.default.properties (original)
+++ myfaces/trunk/build/build.default.properties Mon May  9 03:42:08 2005
@@ -108,3 +108,6 @@
 # tomcat.remote.deploy=true
 # Set this to true if you want to deploy the examples webapp on a tomcat version < 5.5
 tomcat.pre.5.5.version=true
+
+# Default forrest generation site dir
+site.build.dir=${project.dir}/../site

Modified: myfaces/trunk/build/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/build/build.xml?rev=169271&r1=169270&r2=169271&view=diff
==============================================================================
--- myfaces/trunk/build/build.xml (original)
+++ myfaces/trunk/build/build.xml Mon May  9 03:42:08 2005
@@ -32,7 +32,6 @@
     <property file="build.local.properties"/>
     <property file="build.default.properties"/>
     <property file="manifest.properties"/>
-    <property file="forrest.local.properties"/>
 
     <property name="release.version" value="${manifest.impl.version}"/>
     <property name="src.release.bundle" value="myfaces-${release.version}-src"/>
@@ -838,19 +837,23 @@
 
     <target name="site">
 
+        <!--
+        Preconditions for use of this target: see build-site.xml
+        -->
+
         <!-- build forrest site -->
         <ant antfile="build-site.xml" inheritall="false" target="all">
-            <property file="forrest.local.properties"/>
+            <property name="project.site-dir" value="${site.build.dir}"/>
         </ant>
 
         <!-- add javadoc -->
         <ant target="javadoc">
-            <property name="javadoc.dir" value="${project.site-dir}/javadoc"/>
+            <property name="javadoc.dir" value="${site.build.dir}/javadoc"/>
         </ant>
 
         <!-- add tld javadoc -->
         <ant target="tlddoc">
-            <property name="tlddoc.dir" value="${project.site-dir}/tlddoc"/>
+            <property name="tlddoc.dir" value="${site.build.dir}/tlddoc"/>
         </ant>
 
     </target>

Modified: myfaces/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/myfaces/trunk/forrest.properties?rev=169271&r1=169270&r2=169271&view=diff
==============================================================================
--- myfaces/trunk/forrest.properties (original)
+++ myfaces/trunk/forrest.properties Mon May  9 03:42:08 2005
@@ -12,6 +12,3 @@
 project.skin=forrest-site
 #project.skin=forrest-css
 #project.skin=avalon-tigris
-
-# Already prepared for future SVN repository structure
-project.site-dir=${basedir}/../site