Author: norman.richards(a)jboss.com Date: 2008-10-21 11:31:58 -0400 (Tue, 21 Oct 2008) New Revision: 9374 Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl Log: merge 9372 and 9373 into 2.1.0.GA Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373) +++ tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build-war.xml 2008-10-21 15:31:58 UTC (rev 9374) @@ -248,9 +248,9 @@ <fail unless="jboss.home">jboss.home not set</fail> <mkdir dir="${war.deploy.dir}"/> - <sync todir="${war.deploy.dir}"> + <copy todir="${war.deploy.dir}"> <fileset dir="${war.dir}"/> - </sync> + </copy> </target> <target name="unexplode" description="Undeploy the exploded archive"> Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373) +++ tags/JBoss_Seam_2_1_0_GA/seam-gen/build-scripts/build.xml 2008-10-21 15:31:58 UTC (rev 9374) @@ -254,15 +254,15 @@ <mkdir dir="${jar.deploy.dir}"/> <mkdir dir="${war.deploy.dir}"/> - <sync todir="${jar.deploy.dir}"> + <copy todir="${jar.deploy.dir}"> <fileset dir="${jar.dir}"/> - </sync> - <sync todir="${war.deploy.dir}"> + </copy> + <copy todir="${war.deploy.dir}"> <fileset dir="${war.dir}"/> - </sync> - <sync todir="${ear.deploy.dir}"> + </copy> + <copy todir="${ear.deploy.dir}"> <fileset dir="${ear.dir}"/> - </sync> + </copy> </target> <target name="unexplode" description="Undeploy the exploded archive"> Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:15:27 UTC (rev 9373) +++ tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-21 15:31:58 UTC (rev 9374) @@ -242,9 +242,9 @@ <fail unless="jboss.home">jboss.home not set</fail> <mkdir dir="${war.deploy.dir}"/> - <sync todir="${war.deploy.dir}"> + <copy todir="${war.deploy.dir}"> <fileset dir="${war.dir}"/> - </sync> + </copy> </target> <target name="unexplode" description="Undeploy the exploded archive"> Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:15:27 UTC (rev 9373) +++ tags/JBoss_Seam_2_1_0_GA/seam-gen/icefaces/build-scripts/build.xml 2008-10-21 15:31:58 UTC (rev 9374) @@ -249,15 +249,15 @@ <mkdir dir="${jar.deploy.dir}"/> <mkdir dir="${war.deploy.dir}"/> - <sync todir="${jar.deploy.dir}"> + <copy todir="${jar.deploy.dir}"> <fileset dir="${jar.dir}"/> - </sync> - <sync todir="${war.deploy.dir}"> + </copy> + <copy todir="${war.deploy.dir}"> <fileset dir="${war.dir}"/> - </sync> - <sync todir="${ear.deploy.dir}"> + </copy> + <copy todir="${ear.deploy.dir}"> <fileset dir="${ear.dir}"/> - </sync> + </copy> </target> <target name="unexplode" description="Undeploy the exploded archive"> Modified: tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl =================================================================== --- tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl 2008-10-21 15:15:27 UTC (rev 9373) +++ tags/JBoss_Seam_2_1_0_GA/seam-gen/view/view.xhtml.ftl 2008-10-21 15:31:58 UTC (rev 9374) @@ -102,7 +102,7 @@ </#if> </#if> </#foreach> - <h:column> + <h:column styleClass="action"> <f:facet name="header">Action</f:facet> <s:link id="view${parentName}" value="View"