[jboss-cvs] jboss-seam/seam-gen/build-scripts ...

Gavin King gavin.king at jboss.com
Wed Mar 7 00:22:48 EST 2007


  User: gavin   
  Date: 07/03/07 00:22:48

  Modified:    seam-gen/build-scripts    .classpath build-war.xml build.xml
  Log:
  support hotdeployment of components in war projects
  
  Revision  Changes    Path
  1.11      +3 -2      jboss-seam/seam-gen/build-scripts/.classpath
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: .classpath
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/.classpath,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- .classpath	31 Jan 2007 06:28:01 -0000	1.10
  +++ .classpath	7 Mar 2007 05:22:48 -0000	1.11
  @@ -1,6 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <classpath>
  -	<classpathentry kind="src" path="src"/>
  +	<classpathentry kind="src" path="src/model" output="classes/model"/>
  +	<classpathentry kind="src" path="src/action" output="classes/action"/>
       <classpathentry kind="src" path="test"/>
   	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   	<classpathentry kind="lib" path="embedded-ejb/conf"/>
  @@ -30,5 +31,5 @@
   	<classpathentry kind="lib" path="lib/el-api.jar"/>
   	<classpathentry kind="lib" path="lib/el-ri.jar"/>
   	<classpathentry kind="lib" path="lib/@driverJar@"/>
  -	<classpathentry kind="output" path="test-build"/>
  +	<classpathentry kind="output" path="classes/test"/>
   </classpath>
  
  
  
  1.6       +32 -11    jboss-seam/seam-gen/build-scripts/build-war.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build-war.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/build-war.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- build-war.xml	23 Feb 2007 01:21:13 -0000	1.5
  +++ build-war.xml	7 Mar 2007 05:22:48 -0000	1.6
  @@ -8,12 +8,13 @@
   	<!-- set global properties for this build -->
   	<property name="project.name" value="@projectName@"/>
   	<property name="dist.dir" value="dist" />
  -	<property name="src.java.dir" value="src" />
  +	<property name="src.model.dir" value="src/model" />
  +	<property name="src.action.dir" value="src/action" />
   	<property name="src.test.dir" value="test" />
   	<property name="lib.dir" value="lib" />
   	<property name="war.dir" value="exploded-archives/${project.name}.war" />
   	<property name="classes.dir" value="${war.dir}/WEB-INF/classes" />
  -	<property name="test.dir" value="test-build" />
  +	<property name="test.dir" value="classes/test" />
   	<property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
   	<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
   	<property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
  @@ -32,10 +33,11 @@
   
   	<target name="init" description="Initialize the build">
   		<mkdir dir="${war.dir}/WEB-INF/classes" />
  +		<mkdir dir="${war.dir}/WEB-INF/dev" />
   		<mkdir dir="${dist.dir}" />
   	</target>
   
  -	<target name="compile" depends="init" 
  +	<target name="compilemodel" depends="init" 
   			description="Compile the Java source code"
   		    unless="eclipse.running">
   		<javac classpathref="build.classpath" 
  @@ -43,7 +45,20 @@
   			          debug="${javac.debug}" 
   			    deprecation="${javac.deprecation}" 
   			        nowarn="on">
  -			<src path="${src.java.dir}" />
  +			<src path="${src.model.dir}" />
  +		</javac>
  +	</target>
  +
  +	<target name="compileactions" depends="init" 
  +			description="Compile the Java source code"
  +		    unless="eclipse.running">
  +		<javac classpathref="build.classpath" 
  +			        destdir="${war.dir}/WEB-INF/dev" 
  +			          debug="${javac.debug}" 
  +			    deprecation="${javac.deprecation}" 
  +			        nowarn="on">
  +			<classpath path="${war.dir}/WEB-INF/classes"/>
  +			<src path="${src.action.dir}" />
   		</javac>
   	</target>
   
  @@ -51,13 +66,18 @@
   			description="Copy the classes that were compiled by eclipse"
   		    if="eclipse.running">
   		<copy todir="${war.dir}/WEB-INF/classes">
  -			<fileset dir="${test.dir}">
  +			<fileset dir="classes/model">
  +				<include name="**/*.class"/>
  +			</fileset>
  +		</copy>
  +		<copy todir="${war.dir}/WEB-INF/dev">
  +			<fileset dir="classes/action">
   				<include name="**/*.class"/>
   			</fileset>
   		</copy>
   	</target>
   
  -	<target name="war" depends="compile,copyclasses" 
  +	<target name="war" depends="compilemodel,compileactions,copyclasses" 
   			description="Build the distribution .war file">
   
   		<copy todir="${war.dir}/WEB-INF/classes">
  @@ -205,7 +225,8 @@
                             debug="${javac.debug}"
                       deprecation="${javac.deprecation}"
                           nowarn="on">
  -                <src path="${src.java.dir}" />
  +                <src path="${src.action.dir}" />
  +                <src path="${src.model.dir}" />
                   <src path="${src.test.dir}" />
           </javac>
   	</target>
  
  
  
  1.25      +11 -5     jboss-seam/seam-gen/build-scripts/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build-scripts/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- build.xml	23 Feb 2007 01:21:13 -0000	1.24
  +++ build.xml	7 Mar 2007 05:22:48 -0000	1.25
  @@ -8,13 +8,14 @@
   	<!-- set global properties for this build -->
   	<property name="project.name" value="@projectName@"/>
   	<property name="dist.dir" value="dist" />
  -	<property name="src.java.dir" value="src" />
  +	<property name="src.action.dir" value="src/action" />
  +	<property name="src.model.dir" value="src/model" />
   	<property name="src.test.dir" value="test" />
   	<property name="lib.dir" value="lib" />
   	<property name="ear.dir" value="exploded-archives/${project.name}.ear" />
   	<property name="jar.dir" value="exploded-archives/${project.name}.jar" />
   	<property name="war.dir" value="exploded-archives/${project.name}.war" />
  -	<property name="test.dir" value="test-build" />
  +	<property name="test.dir" value="classes/test" />
   	<property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
   	<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
   	<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
  @@ -48,7 +49,8 @@
   			          debug="${javac.debug}" 
   			    deprecation="${javac.deprecation}" 
   			        nowarn="on">
  -			<src path="${src.java.dir}" />
  +			<src path="${src.model.dir}" />
  +			<src path="${src.action.dir}" />
   		</javac>
   	</target>
   
  @@ -56,7 +58,10 @@
   			description="Copy the classes that were compiled by eclipse"
   		    if="eclipse.running">
   		<copy todir="${jar.dir}">
  -			<fileset dir="${test.dir}">
  +			<fileset dir="classes/model">
  +				<include name="**/*.class"/>
  +			</fileset>
  +			<fileset dir="classes/action">
   				<include name="**/*.class"/>
   			</fileset>
   		</copy>
  @@ -233,7 +238,8 @@
                             debug="${javac.debug}"
                       deprecation="${javac.deprecation}"
                           nowarn="on">
  -                <src path="${src.java.dir}" />
  +                <src path="${src.action.dir}" />
  +                <src path="${src.model.dir}" />
                   <src path="${src.test.dir}" />
           </javac>
   	</target>
  
  
  



More information about the jboss-cvs-commits mailing list