CVS: TapestryBook/hangman1 .cvsignore,1.1,1.2 build.xml,1.2,1.3 jetty.xml,1.3,NONE

Update of /cvsroot/tapestry/TapestryBook/hangman1
In directory sc8-pr-cvs1:/tmp/cvs-serv24404/hangman1

Modified Files:
	.cvsignore build.xml 
Removed Files:
	jetty.xml 
Log Message:
Reorganize more examples for common build file.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tapestry/TapestryBook/hangman1/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	7 Feb 2003 16:39:03 -0000	1.1
--- .cvsignore	12 Jul 2003 15:50:26 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
  classes
  hangman1.war
+ target

Index: build.xml
===================================================================
RCS file: /cvsroot/tapestry/TapestryBook/hangman1/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	20 Feb 2003 15:13:52 -0000	1.2
--- build.xml	12 Jul 2003 15:50:26 -0000	1.3
***************
*** 1,18 ****
  <?xml version="1.0"?>
  <!-- $Id$ -->
! <project name="Hangman1" default="war">
! 	<property name="root.dir" value=".."/>
! 	<property file="${root.dir}/common/common.properties"/>
! 	<property file="${common.dir}/build.properties"/>
! 	<property name="war.file" value="hangman1.war"/>
  	<path id="project.class.path">
! 		<fileset dir="${lib.war.dir}">
  			<include name="*.jar"/>
  		</fileset>
  	</path>
  	<target name="clean" description="Deletes derived files.">
! 		<delete dir="${classes.dir}" quiet="true"/>
! 		<delete file="${war.file}" quiet="true"/>
  	</target>
  	<target name="compile" description="Compile Java classes.">
  		<mkdir dir="${classes.dir}"/>
--- 1,46 ----
  <?xml version="1.0"?>
  <!-- $Id$ -->
! <project name="Tapestry In Action -- Hangman, version 1" default="war">
! 
! 	<!-- Customize this to match the desired name. -->
! 	
! 	<property name="project.name" value="hangman1"/>
! 	
! 	<!-- Find out where other project's distributions are. -->
! 	
! 	<property file="../common/build.properties"/>
! 	
! 	<!-- All derived files end up somewhere under target. -->
! 	
! 	<property name="target.dir" value="target"/>
! 	
! 	<property name="src.dir" value="src/java"/>
! 	<property name="context.dir" value="src/context"/>
! 	<property name="conf.dir" value="src/conf"/>
! 			
! 	<property name="classes.dir" value="${target.dir}/classes"/>
! 	<property name="war.file" value="${target.dir}/${project.name}.war"/>
! 	
! 	<!-- We expect Tomcat to be available. -->
! 	
! 	<property name="servlet.jar" value="${tomcat.dir}/common/lib/servlet.jar"/>
! 		
  	<path id="project.class.path">
! 		<fileset dir="${tapestry.dist.dir}/lib">
! 		
! 			<!-- The Tapestry JARs -->
  			<include name="*.jar"/>
+ 			
+ 			<!-- Dependencies of Tapestry. -->
+ 			
+ 			<include name="**/*.jar"/>
  		</fileset>
+ 		<pathelement location="${servlet.jar}"/>
  	</path>
+ 	
  	<target name="clean" description="Deletes derived files.">
! 		<delete dir="${target.dir}" quiet="true"/>
  	</target>
+ 	
  	<target name="compile" description="Compile Java classes.">
  		<mkdir dir="${classes.dir}"/>
***************
*** 20,63 ****
  			classpathref="project.class.path"/>
  	</target>
  	<target name="war" depends="compile"
! 		description="Compile all classes and build the installed WAR.">
! 		<war warfile="${war.dir}/${war.file}" webxml="context/WEB-INF/web.xml">
! 			<fileset dir="context">
  				<exclude name="WEB-INF/web.xml"/>
- 				<exclude name="**/Thumbs.db"/>
  	 		</fileset>
  			<classes dir="${classes.dir}"/>
  			<classes dir="${src.dir}">
  				<exclude name="**/*.java"/>
  				<exclude name="**/package.html"/>
  			</classes>
! 			<lib dir="${lib.war.dir}"/>
  		</war>
  	</target>
! 	<target name="run" description="Run the Hangman application."
! 		depends="compile">
! 		<java classname="org.mortbay.jetty.Server" fork="true">
! 			<classpath>
! 				<!-- Favor files in src over copies in classes -->
! 				<pathelement location="${src.dir}"/>
! 				<pathelement location="${root.dir}/config"/>
! 				<path refid="project.class.path"/>
! 				<pathelement location="${lib.ext.dir}/${jetty.jar}"/>
! 				<pathelement location="${lib.ext.dir}/${log4j.jar}"/>
! 				<pathelement location="${classes.dir}"/>
! 			</classpath>
! 			<arg value="jetty.xml"/>
! 			<!-- Enable debugging on port 20150 -->
! 			<jvmarg line="-showversion -Xdebug -Xnoagent"/>
! 			<jvmarg
! 				line="-Xrunjdwp:transport=dt_socket,suspend=n,server=y,address=20150"
! 				/>
! 			<sysproperty key="java.compiler" value="NONE"/>
! 			<sysproperty key="net.sf.tapestry.disable-caching" value="true"/>
! 			<sysproperty key="net.sf.tapestry.enable-reset-service" value="true"
! 				/>
! 			<sysproperty key="org.mortbay.util.FileResource.checkAliases"
! 				value="false"/>
! 		</java>
  	</target>
  </project>
--- 48,102 ----
  			classpathref="project.class.path"/>
  	</target>
+ 	
  	<target name="war" depends="compile"
! 		description="Compile all classes and build the WAR.">
! 		<war warfile="${war.file}" webxml="${context.dir}/WEB-INF/web.xml">
! 		
! 			<!-- Copy everything in the context directory to the root of the WAR, including
! 			     everything in WEB-INF, except for the web.xml, which the <war> task
! 			     strangely demands be seperate. -->
! 			     
! 			<fileset dir="${context.dir}">
  				<exclude name="WEB-INF/web.xml"/>
  	 		</fileset>
+ 	 		
+ 	 		<!-- Pick up compiled classes.  These go into WEB-INF/classes.  -->
+ 	 		
  			<classes dir="${classes.dir}"/>
+ 						
+ 			<!-- Pick up properties files and such from the Java source directory. -->
+ 			
  			<classes dir="${src.dir}">
  				<exclude name="**/*.java"/>
  				<exclude name="**/package.html"/>
  			</classes>
! 			
! 			<!-- There isn't a way to flatten, so we need to do this XXX times. --> 
! 			
! 			<lib dir="${tapestry.dist.dir}/lib">
! 			  <include name="*.jar"/>
! 			</lib>
! 			
! 			<!-- Pick up the main Tapestry dependencies. -->
! 			
! 			<lib dir="${tapestry.dist.dir}/lib/ext">
! 				<include name="*.jar"/>
! 			</lib>
! 			
! 			<!-- lib dir="${tapestry.dist.dir}/lib/runtime">
! 				<include name="*.jar"/>
! 			</lib-->
! 
  		</war>
  	</target>
! 	
! 	<target name="deploy" depends="war"
! 		description="Deploy the WAR into Tomcat.">
! 		
! 		<!-- You can deploy elsewhere by setting deploy.dir in the build.properties file. -->
! 		
! 		<property name="deploy.dir" value="${tomcat.dir}/webapps"/>
! 		
! 		<copy file="${war.file}" todir="${deploy.dir}"/>
  	</target>
  </project>

--- jetty.xml DELETED ---



-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1