svn commit: rev 10467 - in xml/forrest/trunk: . src/core src/core/fresh-site

[br...@apache.org]

Author: brondsem
Date: Fri Apr 30 19:09:29 2004
New Revision: 10467

Removed:
   xml/forrest/trunk/src/core/fresh-site/forrest-targets.ent
   xml/forrest/trunk/src/core/fresh-site/forrest-targets.xml
Modified:
   xml/forrest/trunk/src/core/forrest.antproxy.xml
   xml/forrest/trunk/status.xml
Log:
Forrest-targets with ant proxy is obsolete; use forrestbot now

Modified: xml/forrest/trunk/src/core/forrest.antproxy.xml
==============================================================================
--- xml/forrest/trunk/src/core/forrest.antproxy.xml	(original)
+++ xml/forrest/trunk/src/core/forrest.antproxy.xml	Fri Apr 30 19:09:29 2004
@@ -15,56 +15,29 @@
   limitations under the License.
 -->
 
+<!--
+This file kept for backwards-compatibility (well, backwards-warning at least).
+In the future we can probably remove it altogether.
+-->
 <project default="site" basedir="." name="Forrest Ant proxy targets">
 
-  <description>
-    Proxy Forrest targets that run the customized Ant provided with Forrest,
-    rather than using the invoker's version.
-
-    The 'validate' target in forrest.build.xml requires a patched Ant 1.6 to
-    run.  Thus if forrest.build.xml is invoked from a user's script, it will
-    fail.  The solution is to invoke this script's proxy targets, eg:
-
-    <![CDATA[
-    <target name="site" description="Build a static website">
-      <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
-    </target>
-    ]]>
-  </description>
-
-  <property name="build.sysclasspath" value="ignore"/>
+  <property name="obsolete.message" value="${line.separator}${line.separator}The use of forrest-targets.ent as an 'ant proxy' is no longer supported.${line.separator}Please see the forrestbot documentation for instructions on how to use and extend forrest with Ant buildfiles."/>
 
   <target name="validate" description="Validates XML doc files">
-    <antcall target="forrest"><param name="target" value="validate"/></antcall>
+    <fail>${obsolete.message}</fail>
   </target>
   <target name="webapp" description="Generates an unpacked webapp">
-    <antcall target="forrest"><param name="target" value="webapp"/></antcall>
+    <fail>${obsolete.message}</fail>
   </target>
   <target name="war" description="Generates a packaged .war webapp">
-    <antcall target="forrest"><param name="target" value="war"/></antcall>
+    <fail>${obsolete.message}</fail>
   </target>
   <target name="site" description="Generates static HTML">
-    <antcall target="forrest"><param name="target" value="site"/></antcall>
+    <fail>${obsolete.message}</fail>
   </target>
 
-  <path id="forrest-classpath">
-    <fileset dir="${forrest.home}">
-      <include name="tools/ant/lib/*.jar"/>
-      <include name="lib/endorsed/*.jar"/>
-    </fileset>
-    <pathelement location="${java.home}/../lib/tools.jar"/>
-  </path>
-
   <target name="forrest">
-    <property name="project.home" location="."/>
-    <java classname="org.apache.tools.ant.Main" fork="true" failonerror="true">
-      <classpath refid="forrest-classpath"/>
-      <jvmarg value="-Dforrest.home=${forrest.home}"/>
-      <jvmarg value="-Dbasedir=${basedir}"/>
-      <jvmarg value="-Dproject.home=${project.home}"/>
-      <jvmarg value="-Djava.endorsed.dirs=${forrest.home}/lib/endorsed${path.separator}${java.endorsed.dirs}"/>
-      <arg line="-f '${forrest.home}/forrest.build.xml' -emacs ${target}"/>
-    </java>
+    <fail>${obsolete.message}</fail>
   </target>
 
 

Modified: xml/forrest/trunk/status.xml
==============================================================================
--- xml/forrest/trunk/status.xml	(original)
+++ xml/forrest/trunk/status.xml	Fri Apr 30 19:09:29 2004
@@ -44,7 +44,10 @@
 
   <changes>
     <release version="0.6-dev" date="unreleased">
-      <action dev="DPB" type="update" context="shbat" fixes-bug="FOR-137">
+      <action dev="DB" type="remove" context="shbat" fixes-bug="FOR-140">
+        Forrest-targets with ant proxy is obsolete; use forrestbot now
+      </action>
+      <action dev="DB" type="update" context="shbat" fixes-bug="FOR-137">
         'build patch' command updated for SVN
       </action>
       <action dev="JJP" type="update" context="core" due-to="Florian G. Haas" fixes-bug="FOR-9">