Author: dan.j.allen Date: 2009-03-12 16:56:57 -0400 (Thu, 12 Mar 2009) New Revision: 10151 Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build.xml Log: strip the -war qualifier from the persistence unit configuration files for WAR projects Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2009-03-12 20:08:19 UTC (rev 10150) +++ trunk/seam-gen/build-scripts/build-war.xml 2009-03-12 20:56:57 UTC (rev 10151) @@ -179,7 +179,7 @@ overwrite="true"/> <copy tofile="${war.dir}/WEB-INF/classes/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-${profile}-war.xml" + file="${basedir}/resources/META-INF/persistence-${profile}.xml" overwrite="true"/> <copy tofile="${war.dir}/WEB-INF/classes/import.sql" @@ -376,7 +376,7 @@ <fileset dir="${basedir}/view"/> </copy> <copy tofile="${test.dir}/META-INF/persistence.xml" - file="${basedir}/resources/META-INF/persistence-test-war.xml" + file="${basedir}/resources/META-INF/persistence-test.xml" overwrite="true"/> <copy tofile="${test.dir}/import.sql" file="${basedir}/resources/import-test.sql" Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2009-03-12 20:08:19 UTC (rev 10150) +++ trunk/seam-gen/build.xml 2009-03-12 20:56:57 UTC (rev 10151) @@ -679,6 +679,7 @@ </fileset> <filterset refid="project"/> <filterset refid="jdbc"/> + <globmapper from="*-war.xml" to="*.xml"/> </copy> <copy todir="${project.home}/src/hot" file="${templates.dir}/resources/seam.properties"/> <copy todir="${project.home}/src/main" file="${templates.dir}/resources/seam.properties"/>