Author: dan.j.allen Date: 2008-09-23 15:34:38 -0400 (Tue, 23 Sep 2008) New Revision: 9128 Added: trunk/seam-gen/resources/META-INF/orm.xml Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/build.xml trunk/seam-gen/icefaces/build-scripts/build-war.xml trunk/seam-gen/icefaces/build-scripts/build.xml Log: include META-INF/orm.xml in build copy *.skin.properties in RichFaces projects copy *_theme.properties (Seam themes) include view directory in buildtest add "re" targets for pulling a project from server then putting it back Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-09-23 19:24:53 UTC (rev 9127) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -189,6 +189,8 @@ <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> <include name="messages*.properties"/> + <include name="*.skin.properties"/> + <include name="*_theme.properties"/> </fileset> </copy> @@ -236,6 +238,9 @@ <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> <delete dir="${war.deploy.dir}" failonerror="no"/> </target> + + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> <target name="restart" depends="explode" description="Restart the exploded archive"> <touch file="${war.deploy.dir}/WEB-INF/web.xml"/> @@ -251,6 +256,9 @@ <delete file="${deploy.dir}/${project.name}-dev-ds.xml" /> <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> </target> + + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> <target name="clean" description="Cleans up the build directory"> <delete dir="${dist.dir}"/> @@ -304,6 +312,7 @@ <exclude name="${project.name}-*-ds.xml"/> <exclude name="components-*.properties"/> </fileset> + <fileset dir="${basedir}/view"/> </copy> <copy tofile="${test.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-test-war.xml" Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-09-23 19:24:53 UTC (rev 9127) +++ trunk/seam-gen/build-scripts/build.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -128,6 +128,8 @@ <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> <include name="messages*.properties"/> + <include name="*.skin.properties"/> + <include name="*_theme.properties"/> </fileset> </copy> </target> @@ -205,6 +207,9 @@ <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> <delete dir="${ear.deploy.dir}" failonerror="no"/> </target> + + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> <target name="restart" depends="explode" description="Restart the exploded archive"> <touch file="${ear.deploy.dir}/META-INF/application.xml"/> @@ -221,6 +226,9 @@ <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> </target> + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + <target name="clean" description="Cleans up the build directory"> <delete dir="${dist.dir}"/> <delete dir="${ear.dir}"/> @@ -276,6 +284,7 @@ <exclude name="${project.name}-*-ds.xml"/> <exclude name="components-*.properties"/> </fileset> + <fileset dir="${basedir}/view"/> </copy> <copy tofile="${test.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-test.xml" Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-09-23 19:24:53 UTC (rev 9127) +++ trunk/seam-gen/build.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -676,6 +676,7 @@ </copy> <copy todir="${project.home}/resources"> <fileset dir="${base.dir}/resources/"> + <include name="META-INF/orm.xml"/> <include name="META-INF/persistence*-war.xml"/> <include name="WEB-INF/jboss-web.xml"/> </fileset> @@ -709,6 +710,7 @@ <include name="META-INF/application.xml"/> <include name="META-INF/jboss-app.xml"/> <include name="META-INF/ejb-jar.xml"/> + <include name="META-INF/orm.xml"/> <include name="META-INF/persistence*.xml"/> <exclude name="META-INF/persistence*-war.xml"/> </fileset> @@ -1260,7 +1262,7 @@ </target> <target name="settings" depends="init-properties" - description="Print the settings"> + description="Print the settings"> <echo message="Java project workspace: ${workspace.home}"/> <echo message="JBoss home: ${jboss.home}"/> <echo message="IceFaces: ${icefaces}"/> Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-09-23 19:24:53 UTC (rev 9127) +++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -190,11 +190,13 @@ <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> <include name="messages*.properties"/> + <include name="*_theme.properties"/> </fileset> </copy> <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> + <include name="META-INF/orm.xml" /> <include name="*jpdl.xml" /> <include name="hibernate.cfg.xml" /> <include name="jbpm.cfg.xml" /> @@ -236,6 +238,9 @@ <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> <delete dir="${war.deploy.dir}" failonerror="no"/> </target> + + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> <target name="restart" depends="explode" description="Restart the exploded archive"> <touch file="${war.deploy.dir}/WEB-INF/web.xml"/> @@ -251,6 +256,9 @@ <delete file="${deploy.dir}/${project.name}-dev-ds.xml" /> <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> </target> + + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> <target name="clean" description="Cleans up the build directory"> <delete dir="${dist.dir}"/> @@ -304,6 +312,7 @@ <exclude name="${project.name}-*-ds.xml"/> <exclude name="components-*.properties"/> </fileset> + <fileset dir="${basedir}/view"/> </copy> <copy tofile="${test.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-test-war.xml" Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-23 19:24:53 UTC (rev 9127) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -87,6 +87,7 @@ <copy todir="${jar.dir}/META-INF"> <fileset dir="${basedir}/resources/META-INF"> <include name="ejb-jar.xml" /> + <include name="orm.xml" /> </fileset> </copy> <copy tofile="${jar.dir}/META-INF/persistence.xml" @@ -127,6 +128,7 @@ <copy todir="${war.dir}/WEB-INF/classes"> <fileset dir="${basedir}/resources"> <include name="messages*.properties"/> + <include name="*_theme.properties"/> </fileset> </copy> </target> @@ -205,6 +207,9 @@ <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/> <delete dir="${ear.deploy.dir}" failonerror="no"/> </target> + + <target name="reexplode" depends="unexplode,clean,explode" + description="Undeploy the exploded archive, clean, then deploy the exploded archive"/> <target name="restart" depends="explode" description="Restart the exploded archive"> <touch file="${ear.deploy.dir}/META-INF/application.xml"/> @@ -221,6 +226,9 @@ <delete file="${deploy.dir}/${project.name}-prod-ds.xml" /> </target> + <target name="redeploy" depends="undeploy,clean,deploy" + description="Undeploy the packaged archive, clean, then deploy the packaged archive"/> + <target name="clean" description="Cleans up the build directory"> <delete dir="${dist.dir}"/> <delete dir="${ear.dir}"/> @@ -276,6 +284,7 @@ <exclude name="${project.name}-*-ds.xml"/> <exclude name="components-*.properties"/> </fileset> + <fileset dir="${basedir}/view"/> </copy> <copy tofile="${test.dir}/META-INF/persistence.xml" file="${basedir}/resources/META-INF/persistence-test.xml" Added: trunk/seam-gen/resources/META-INF/orm.xml =================================================================== --- trunk/seam-gen/resources/META-INF/orm.xml (rev 0) +++ trunk/seam-gen/resources/META-INF/orm.xml 2008-09-23 19:34:38 UTC (rev 9128) @@ -0,0 +1,18 @@ +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/persistence/orm + http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" + version="1.0"> + <!-- Enable for security checks on entity CRUD operations --> + <!-- + <persistence-unit-metadata> + <persistence-unit-defaults> + <entity-listeners> + <entity-listener class="org.jboss.seam.security.EntitySecurityListener"/> + </entity-listeners> + </persistence-unit-defaults> + </persistence-unit-metadata> + --> +</entity-mappings> +