[jboss-cvs] jboss-seam/examples ...

[Peter Muir]

  User: pmuir   
  Date: 07/09/25 12:13:20

  Modified:    examples  build.xml
  Log:
  Lots of fixes for examples builds inc. port groovybooking build onto shared, fix wiki build, stop using provided scope, and some runtime dependencies
  
  Revision  Changes    Path
  1.40      +39 -4     jboss-seam/examples/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -b -r1.39 -r1.40
  --- build.xml	24 Sep 2007 09:40:12 -0000	1.39
  +++ build.xml	25 Sep 2007 16:13:20 -0000	1.40
  @@ -119,6 +119,11 @@
   		<exclude name="**/*" />
   	</fileset>
   
  +	<!-- Extra stuff to delete on clean -->
  +	<fileset id="clean.extras" dir=".">
  +		<exclude name="**/*"/>
  +	</fileset>
  +
   	<!-- ############## SEAM JARS AND REQUIRED DEPENDENCIES ############### -->
   	<!-- 
   	  Seam is made up of a number of jars.  They are specified here, with
  @@ -230,7 +235,7 @@
   
   	<!-- Dependencies for using Seam with JBoss Cache (s:cache) -->
   	<fileset id="cache.jar" dir="${lib.dir}">
  -		<include name="jboss-cache-jdk50.jar" if="cache.lib" />
  +		<include name="jboss-cache.jar" if="cache.lib" />
   		<include name="jboss-aop.jar" if="cache.lib" />
   		<include name="jgroups.jar" if="cache.lib" />
   	</fileset>
  @@ -267,6 +272,11 @@
   		<include name="antlr-*.jar" if="antlr.lib" />
   	</fileset>
   
  +	<!-- Dependencies for using with antlr (if not shipped with server) -->
  +	<fileset id="groovy.jar" dir="${lib.dir}">
  +		<include name="groovy-all.jar" if="groovy.lib" />
  +	</fileset>
  +
   
   	<!-- ############################ MELDWARE ############################ -->
   	<!--
  @@ -342,6 +352,7 @@
   		<include name="*.jpdl.xml" />
   		<include name="jbpm.cfg.xml" />
   		<include name="hibernate.cfg.xml" />
  +		<include name="*.drl" />
   	</fileset>
   
   	<!-- Resources to go in the ear -->
  @@ -407,7 +418,7 @@
   
   	<!-- Compile the source code, directly into the jar -->
   	<target name="compile" depends="init, select-compiler">
  -		<javac classpathref="build.classpath" destdir="${jar.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on">
  +		<javac classpathref="build.classpath" destdir="${jar.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on" >
   			<src path="${src.java.dir}" />
   		</javac>
   	</target>
  @@ -420,8 +431,10 @@
   		</copy>
   	</target>
   
  +	<target name="init.war" />
  +
   	<!-- Build the exploded war -->
  -	<target name="war" depends="compile">
  +	<target name="war" depends="compile, init.war">
   		<copy todir="${war.dir}">
   			<fileset refid="war.view" />
   			<fileset refid="war.extras" />
  @@ -451,6 +464,7 @@
   		<delete dir="${war.dir}" />
   		<delete dir="${jar.dir}" />
   		<delete dir="${test.dir}" />
  +		<delete dir="${clean.extra}" />
   	</target>
   
   
  @@ -679,6 +693,7 @@
   			<fileset refid="jboss-el.jar" />
   			<fileset refid="search.jar" />
   			<fileset refid="richfaces-api.jar" />
  +			<fileset refid="groovy.jar" />
   			<mapper type="flatten" />
   		</copy>
   		<copy todir="${war.dir}">
  @@ -706,7 +721,7 @@
   
   	<!-- #################### BUILD TARGETS (JBOSS AS WAR) #################### -->
   
  -	<target name="jbosswar.deploy" depends="noejb.archive" description="Deploy the example to JBoss AS">
  +	<target name="jbosswar.deploy" depends="noejb.archive, datasource" description="Deploy the example to JBoss AS">
   		<fail unless="jboss.home">
   			jboss.home not set, update build.properties
   		</fail>
  @@ -717,6 +732,26 @@
   		<delete file="${deploy.dir}/${example.name}.war" />
   	</target>
   
  +	<target name="jbosswar.explode" depends="noejb.jar, noejb.war, datasource" description="Deploy the example (exploded) to JBoss AS">
  +		<fail unless="jboss.home">
  +			jboss.home not set, update build.properties
  +		</fail>
  +		<copy todir="${deploy.dir}/${example.name}.war">
  +			<fileset dir="${exploded-archives.dir}/${example.name}.war" />
  +		</copy>
  +		<copy todir="${deploy.dir}/${example.name}.war/WEB-INF/classes">
  +			<fileset dir="${exploded-archives.dir}/${example.name}.jar" />
  +		</copy>
  +	</target>
  +
  +	<target name="jboswar.restart" depends="jbosswar.explode" description="Restart the exploded archive">
  +		<touch file="${deploy.dir}/${example.name}.war/WEB-INF/web.xml" />
  +	</target>
  +	
  +	<target name="jbosswar.unexplode" description="Undeploy the example from JBoss">
  +		<delete dir="${deploy.dir}/${example.name}.war" />
  +	</target>
  +
   	<!-- #################### TEST TARGETS (JBOSS AS) ##################### -->
   	<!--
   	  You can test the example by running the test target.