Author: dan.j.allen Date: 2008-12-01 17:04:14 -0500 (Mon, 01 Dec 2008) New Revision: 9686 Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/icefaces/build-scripts/build-war.xml trunk/seam-gen/icefaces/build-scripts/build.xml Log: JBSEAM-3751 also add the stage target to icefaces EAR/WAR builds and RichFaces WAR builds fix some whitespace Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-12-01 21:49:27 UTC (rev 9685) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-12-01 22:04:14 UTC (rev 9686) @@ -28,6 +28,12 @@ <property name="javac.debug" value="true" /> <property name="javac.deprecation" value="false" /> <property name="debug" value="false" /> + + <!--Properties for validating configuration files --> + <property name="validate.resources.dir" value="${basedir}/exploded-archives"/> + <property name="schema.dir" value="${basedir}/exploded-archives/schemas"/> + <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> + <property name="schema.version" value="@schemaVersion@"/> <fileset id="lib" dir="${lib.dir}"> <include name="*.jar" /> @@ -237,8 +243,10 @@ </copy> </target> + + <target name="stage" depends="war"/> - <target name="archive" depends="war" + <target name="archive" depends="stage" description="Package the WAR archive"> <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> </target> @@ -252,7 +260,7 @@ </copy> </target> - <target name="explode" depends="war,datasource" + <target name="explode" depends="stage,datasource" description="Deploy the exploded archive"> <fail unless="jboss.home">jboss.home not set</fail> @@ -426,5 +434,16 @@ </javadoc> </target> + + <target name="validate" depends="stage" description="Validate the XML configuration files"> + <mkdir dir="${schema.dir}"/> + <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> + <patternset> + <include name="org/jboss/seam/*.xsd"/> + <include name="org/jboss/seam/*.dtd"/> + </patternset> + </unjar> + <ant antfile="validate.xml" target="validateConfiguration"/> + </target> </project> Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-12-01 21:49:27 UTC (rev 9685) +++ trunk/seam-gen/build-scripts/build.xml 2008-12-01 22:04:14 UTC (rev 9686) @@ -107,9 +107,9 @@ <target name="groovy.copy" if="groovy.dynamic"> <copy todir="${jar.dir}"> - <fileset dir="${src.action.dir}"> - <include name="**/*.groovy"/> - </fileset> + <fileset dir="${src.action.dir}"> + <include name="**/*.groovy"/> + </fileset> </copy> </target> @@ -433,7 +433,10 @@ </javadoc> </target> - <target name="validateConfiguration" depends="stage" description="Validate the xml configuration files"> + <!-- deprecated --> + <target name="validateConfiguration" depends="validate"/> + + <target name="validate" depends="stage" description="Validate the XML configuration files"> <mkdir dir="${schema.dir}"/> <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> <patternset> Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-12-01 21:49:27 UTC (rev 9685) +++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-12-01 22:04:14 UTC (rev 9686) @@ -28,6 +28,12 @@ <property name="javac.debug" value="true" /> <property name="javac.deprecation" value="false" /> <property name="debug" value="false" /> + + <!--Properties for validating configuration files --> + <property name="validate.resources.dir" value="${basedir}/exploded-archives"/> + <property name="schema.dir" value="${basedir}/exploded-archives/schemas"/> + <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/> + <property name="schema.version" value="@schemaVersion@"/> <fileset id="lib" dir="${lib.dir}"> <include name="*.jar" /> @@ -226,8 +232,10 @@ </copy> </target> + + <target name="stage" depends="war"/> - <target name="archive" depends="war" + <target name="archive" depends="stage" description="Package the WAR archive"> <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> </target> @@ -241,7 +249,7 @@ </copy> </target> - <target name="explode" depends="war,datasource" + <target name="explode" depends="stage,datasource" description="Deploy the exploded archive"> <fail unless="jboss.home">jboss.home not set</fail> @@ -415,6 +423,17 @@ </javadoc> </target> + + <target name="validate" depends="stage" description="Validate the XML configuration files"> + <mkdir dir="${schema.dir}"/> + <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> + <patternset> + <include name="org/jboss/seam/*.xsd"/> + <include name="org/jboss/seam/*.dtd"/> + </patternset> + </unjar> + <ant antfile="validate.xml" target="validateConfiguration"/> + </target> <target name="freshen" description="grab fresh icefaces jars"> <copy todir="${lib.dir}"> Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-12-01 21:49:27 UTC (rev 9685) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-12-01 22:04:14 UTC (rev 9686) @@ -16,8 +16,8 @@ <property name="lib.dir" value="lib"/> <property name="endorsed.dir" value="${lib.dir}/endorsed"/> <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="jar.dir" value="${ear.dir}/${project.name}.jar"/> + <property name="war.dir" value="${ear.dir}/${project.name}.war"/> <property name="test.dir" value="test-build"/> <property name="bootstrap.dir" value="${basedir}/bootstrap"/> <property name="jboss.domain" value="default"/> @@ -185,12 +185,12 @@ <include name="classes/**/*.class"/> </fileset> </copy> - <copy todir="${war.dir}/WEB-INF/lib"> - <fileset dir="${lib.dir}"> - <includesfile name="deployed-jars-war.list"/> - <exclude name="jboss-seam-gen.jar"/> - </fileset> - </copy> + <copy todir="${war.dir}/WEB-INF/lib"> + <fileset dir="${lib.dir}"> + <includesfile name="deployed-jars-war.list"/> + <exclude name="jboss-seam-gen.jar"/> + </fileset> + </copy> <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> <include name="messages*.properties"/> @@ -224,12 +224,17 @@ </copy> </target> - <target name="archive" depends="jar,war,ear" + <target name="stage" depends="jar,war,ear"/> + + <target name="archive" depends="stage" description="Package the archives"> <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/> <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/> <jar jarfile="${dist.dir}/${project.name}.ear"> - <fileset dir="${ear.dir}"/> + <fileset dir="${ear.dir}"> + <exclude name="${project.name}.jar/**"/> + <exclude name="${project.name}.war/**"/> + </fileset> <fileset dir="${dist.dir}"> <include name="${project.name}.jar"/> <include name="${project.name}.war"/> @@ -246,19 +251,10 @@ </copy> </target> - <target name="explode" depends="jar,war,ear,datasource" - description="Deploy the exploded archive"> + <target name="explode" depends="stage,datasource" + description="Deploy the exploded archive"> <fail unless="jboss.home">jboss.home not set</fail> - <mkdir dir="${jar.deploy.dir}"/> - <mkdir dir="${war.deploy.dir}"/> - - <copy todir="${jar.deploy.dir}"> - <fileset dir="${jar.dir}"/> - </copy> - <copy todir="${war.deploy.dir}"> - <fileset dir="${war.dir}"/> - </copy> <copy todir="${ear.deploy.dir}"> <fileset dir="${ear.dir}"/> </copy> @@ -323,16 +319,16 @@ </target> <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests"> - <mkdir dir="${test.dir}"/> - <javac classpathref="build.classpath" - destdir="${test.dir}" - debug="${javac.debug}" - deprecation="${javac.deprecation}" - nowarn="on"> - <src path="${src.action.dir}"/> - <src path="${src.model.dir}"/> - <src path="${src.test.dir}"/> - </javac> + <mkdir dir="${test.dir}"/> + <javac classpathref="build.classpath" + destdir="${test.dir}" + debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on"> + <src path="${src.action.dir}"/> + <src path="${src.model.dir}"/> + <src path="${src.test.dir}"/> + </javac> </target> <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests"> @@ -427,7 +423,10 @@ </javadoc> </target> - <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files"> + <!-- deprecated --> + <target name="validateConfiguration" depends="validate"/> + + <target name="validate" depends="stage" description="Validate the XML configuration files"> <mkdir dir="${schema.dir}"/> <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}"> <patternset>