Author: dan.j.allen Date: 2009-04-05 23:57:42 -0400 (Sun, 05 Apr 2009) New Revision: 10305 Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/resources/WEB-INF/web.xml trunk/seam-gen/resources/components-dev.properties trunk/seam-gen/resources/components-prod.properties Log: JBSEAM-4082 Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2009-04-06 03:50:29 UTC (rev 10304) +++ trunk/seam-gen/build-scripts/build-war.xml 2009-04-06 03:57:42 UTC (rev 10305) @@ -60,6 +60,9 @@ <mkdir dir="${classes.action.dir}" /> <mkdir dir="${dist.dir}" /> + <condition property="is.debug" value="true"> + <istrue value="${debug}"/> + </condition> <property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> <property name="ejbJndiPattern" value="${project.name}/#{ejbName}/local"/> <condition property="seamBootstrapsPu" value="false" else="true"> @@ -81,6 +84,9 @@ <filter token="seamEmfRef" value="${seamEmfRef}"/> <filter token="puJndiName" value="${puJndiName}"/> </filterset> + <filterset id="profile"> + <filter token="debug" value="${debug}"/> + </filterset> <!-- if a .groovy file is in model or action, set groovy.present --> <available property="groovy.present" value="true" file="" searchparents="true"> @@ -108,13 +114,13 @@ <condition property="groovy.dynamic" value="true"> <and> <isset property="groovy.present"/> - <istrue value="${debug}"/> + <isset property="is.debug"/> </and> </condition> <condition property="groovy.static" value="true"> <and> <isset property="groovy.present"/> - <isfalse value="${debug}"/> + <not><isset property="is.debug"/></not> </and> </condition> </target> @@ -215,6 +221,7 @@ <fileset dir="${basedir}/resources/WEB-INF"> <include name="*.*"/> <include name="lib/*.*"/> + <exclude name="web.xml"/> </fileset> </copy> @@ -222,6 +229,7 @@ <fileset dir="${lib.dir}"> <includesfile name="deployed-jars.list"/> <exclude name="jboss-seam-gen.jar"/> + <exclude name="jboss-seam-debug.jar" unless="is.debug"/> <exclude name="icefaces-ahs.jar" if="icefaces.present"/> <include name="groovy-*.jar" if="groovy.present"/> </fileset> @@ -251,6 +259,11 @@ </fileset> </copy> + <copy todir="${war.dir}/WEB-INF" + file="${basedir}/resources/WEB-INF/web.xml"> + <filterset refid="profile"/> + </copy> + </target> <target name="clear-profile-artifacts" depends="init" Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2009-04-06 03:50:29 UTC (rev 10304) +++ trunk/seam-gen/build-scripts/build.xml 2009-04-06 03:57:42 UTC (rev 10305) @@ -60,6 +60,9 @@ <mkdir dir="${war.dir}"/> <mkdir dir="${dist.dir}"/> + <condition property="is.debug" value="true"> + <istrue value="${debug}"/> + </condition> <property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> <property name="ejbJndiPattern" value="${project.name}/#{ejbName}/local"/> <property name="seamBootstrapsPu" value="false"/> @@ -77,6 +80,9 @@ <filter token="seamEmfRef" value="${seamEmfRef}"/> <filter token="puJndiName" value="${puJndiName}"/> </filterset> + <filterset id="profile"> + <filter token="debug" value="${debug}"/> + </filterset> <!-- if a .groovy file is in model or action, set groovy.present --> <available property="groovy.present" value="true" file="" searchparents="true"> @@ -204,12 +210,14 @@ <fileset dir="${basedir}/resources/WEB-INF"> <include name="*.*"/> <include name="lib/*.*"/> + <exclude name="web.xml"/> </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"/> + <exclude name="jboss-seam-debug.jar" unless="is.debug"/> </fileset> </copy> <copy todir="${war.dir}/WEB-INF/classes"> @@ -225,6 +233,10 @@ <include name="**/*.xcss" if="richfaces.present"/> </fileset> </copy> + <copy todir="${war.dir}/WEB-INF" + file="${basedir}/resources/WEB-INF/web.xml"> + <filterset refid="profile"/> + </copy> </target> <target name="ear" description="Build the EAR structure in a staging directory"> Modified: trunk/seam-gen/resources/WEB-INF/web.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/web.xml 2009-04-06 03:50:29 UTC (rev 10304) +++ trunk/seam-gen/resources/WEB-INF/web.xml 2009-04-06 03:57:42 UTC (rev 10305) @@ -65,7 +65,7 @@ <context-param> <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> + <param-value>@debug@</param-value> </context-param> <!-- JSF --> Modified: trunk/seam-gen/resources/components-dev.properties =================================================================== --- trunk/seam-gen/resources/components-dev.properties 2009-04-06 03:50:29 UTC (rev 10304) +++ trunk/seam-gen/resources/components-dev.properties 2009-04-06 03:57:42 UTC (rev 10305) @@ -1,6 +1,6 @@ # These properties are used to replace Ant-style tokens in the component descriptor (components.xml) at runtime. jndiPattern=@ejbJndiPattern@ -debug=true +debug=@debug@ seamBootstrapsPu=@seamBootstrapsPu@ seamEmfRef=@seamEmfRef@ puJndiName=@puJndiName@ Modified: trunk/seam-gen/resources/components-prod.properties =================================================================== --- trunk/seam-gen/resources/components-prod.properties 2009-04-06 03:50:29 UTC (rev 10304) +++ trunk/seam-gen/resources/components-prod.properties 2009-04-06 03:57:42 UTC (rev 10305) @@ -1,6 +1,6 @@ # These properties are used to replace Ant-style tokens in the component descriptor (components.xml) at runtime. jndiPattern=@ejbJndiPattern@ -debug=false +debug=@debug@ seamBootstrapsPu=@seamBootstrapsPu@ seamEmfRef=@seamEmfRef@ puJndiName=@puJndiName@