Return-Path: 
 <svn-return-6298-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 31421 invoked from network); 21 Nov 2006 23:20:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Nov 2006 23:20:15 -0000
Received: (qmail 57195 invoked by uid 500); 21 Nov 2006 23:20:24 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 57162 invoked by uid 500); 21 Nov 2006 23:20:24 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 57151 invoked by uid 99); 21 Nov 2006 23:20:24 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 15:20:24 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Nov 2006 15:20:12 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 17D5D1A9846; Tue, 21 Nov 2006 15:19:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r477954 - in /forrest/trunk/whiteboard/forrest2/core:
 build.xml
 src/docs/gettingStarted.html
Date: Tue, 21 Nov 2006 23:19:37 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061121231938.17D5D1A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rgardler
Date: Tue Nov 21 15:19:36 2006
New Revision: 477954

URL: http://svn.apache.org/viewvc?view=rev&rev=477954
Log:
Add a run target to the Ant build and update the gettingStarted.html document

Modified:
    forrest/trunk/whiteboard/forrest2/core/build.xml
    forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html

Modified: forrest/trunk/whiteboard/forrest2/core/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/build.xml?view=diff&rev=477954&r1=477953&r2=477954
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/build.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/build.xml Tue Nov 21 15:19:36 2006
@@ -10,8 +10,12 @@
 
 	<property name="project.dist.dir" location="dist" />
 	<property name="project.build.classes.dir" location="build/classes" />
-    <property name="test.reports" location="build/reports" />
+	<property name="test.reports" location="build/reports" />
 	
+	<property name="content.object.dir" location="src/examples/helloWorld"/>
+	<property name="content.object.start.uri" value="helloWorld2.html"/>
+	<property name="content.object.src.dir" location="${content.object.dir}/src"/>
+
 	<property name="compile.debug" value="off" />
 
 	<property name="ivy.jar.dir" location="tools/ivy" />
@@ -23,10 +27,8 @@
 	<path id="ivy.lib.path">
 		<fileset dir="${ivy.jar.dir}" includes="*.jar" />
 	</path>
-	
-	<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" 
-		     uri="antlib:fr.jayasoft.ivy.ant" 
-		     classpathref="ivy.lib.path" />
+
+	<taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
 
 	<target name="clean">
 		<delete dir="${project.build.classes.dir}" />
@@ -36,16 +38,47 @@
 	<target name="init" depends="clean">
 		<mkdir dir="${project.build.classes.dir}" />
 		<mkdir dir="${project.dist.dir}" />
+		<mkdir dir="${project.dist.dir}/lib" />
 		<ivy:cachepath pathid="lib.path.id" conf="default" />
 	</target>
 
-	<target name="compile-core" depends="init">
+	<target name="copy-core-resources" depends="init">
+	  <copy todir="${project.build.classes.dir}">
+	    <fileset dir="${project.core.src.dir}">
+	    	<exclude name="**/*.java"/>
+	    </fileset>
+	  </copy>
+	</target>
+
+	<target name="copy-test-resources" depends="init">
+		  <copy todir="${project.build.classes.dir}">
+		    <fileset dir="${project.core.test.src.dir}">
+		    	<exclude name="**/*.java"/>
+		    </fileset>
+		  </copy>
+	</target>
+
+	<target name="copy-content-object-resources" depends="init">
+		  <copy todir="${project.build.classes.dir}">
+		    <fileset dir="${content.object.src.dir}">
+		    	<exclude name="**/*.java"/>
+		    </fileset>
+		  </copy>
+	</target>
+	
+	<target name="compile-core" depends="copy-core-resources">
 		<javac destdir="${project.build.classes.dir}" debug="${compile.debug}" classpathref="lib.path.id">
 			<src path="${project.core.src.dir}" />
 		</javac>
 	</target>
+	
+	<target name="compile-content-object" depends="compile-core, copy-content-object-resources">
+		<javac destdir="${content.object.dir}" debug="${compile.debug}" classpathref="lib.path.id">
+			<src path="${content.object.src.dir}" />
+		</javac>
+	</target>
 
-	<target name="compile-core-tests" depends="compile-core">
+	<target name="compile-core-tests" depends="compile-core, copy-test-resources">
 		<javac destdir="${project.build.classes.dir}" debug="${compile.debug}" classpathref="lib.path.id">
 			<src path="${project.core.test.src.dir}" />
 		</javac>
@@ -72,6 +105,19 @@
 	</target>
 
 	<target name="deliver" depends="retrieve-all">
-		<ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]" pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
+		<ivy:deliver deliverpattern="${project.dist.dir}/lib/[artifact]-[revision].[ext]" pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
 	</target>
+
+	<target name="run" depends="compile-content-object">
+		<java classname="org.apache.forrest.cli.CLI" 
+			dir="${content.object.dir}" fork="yes" failonerror="yes">
+			<classpath>
+				<path refid="lib.path.id" />
+				<pathelement path="${project.build.classes.dir}"/>
+		        <pathelement path="${content.object.dir}/src"/>
+			</classpath>
+			<arg line="${content.object.start.uri}"/>
+		</java>
+	</target>
+
 </project>

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html?view=diff&rev=477954&r1=477953&r2=477954
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html Tue Nov 21 15:19:36 2006
@@ -33,21 +33,31 @@
   
   <ul>
     <li>ANT 1.6+</li>
+    <li>Java 1.5+</li>
   </ul>
   
   <p class="step">
+    Run the command <span class="source">cd [FORREST2_HOME]</span>
+  </p>
+  
+  <p class="step">
     Run the command <span class="source">ant compile-core</span>
   </p>
   
   <h1>Running from the Command Line</h1>
   
-  <p class="step">cd [CONTENT_OBJECT_DIR]</p>
+  <p class="step">
+    Run the command <span class="source">cd [FORREST2_HOME]</span>
+  </p>
+      
+  <p class="step">ant -Dcontent.object.dir=[CONTENT_DIR] -Dcontent.object.start.uri=[REQUEST_URI]<br/>
+  Where [CONTENT_DIR] is the directory containing the Forrest2 Content Object you wish
+  to work with and [REQUEST_URI] is the URI you wish to request</p>  
   
   <p class="note">There are some example content objects in
-  <span class="source">src/examples</span></p>
+  <span class="source">src/examples</span> for you to try out, for example:
+  ant -Dcontent.object.dir=[FORREST2_HOME]/src/examples/helloWorld -Dcontent.object.start.uri=helloWorld.html run</p>
   
-  <p class="step">java -jar [FORREST2_HOME]/dist/forrest.jar org.apache.forrest.cli.CLI [REQUEST_URI]<br/>
-  Where [REQUEST_URI] is the URI you wish to request</p>  
   
 </body>
 </html>