[seam-commits] Seam SVN: r9723 - in trunk/seam-gen: icefaces/build-scripts and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-12-04 03:31:07 -0500 (Thu, 04 Dec 2008)
New Revision: 9723

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:
remove profile from name of -ds.xml file when deploying

Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml	2008-12-04 08:29:47 UTC (rev 9722)
+++ trunk/seam-gen/build-scripts/build-war.xml	2008-12-04 08:31:07 UTC (rev 9723)
@@ -253,11 +253,9 @@
     
     <target name="datasource">
         <fail unless="jboss.home">jboss.home not set</fail>
-        <copy todir="${deploy.dir}">
-            <fileset dir="${basedir}/resources">
-                <include name="${project.name}-${profile}-ds.xml" />
-            </fileset>
-        </copy>
+        <copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
+            tofile="${deploy.dir}/${project.name}-ds.xml"
+            overwrite="true"/>
     </target>
     
     <target name="explode" depends="stage,datasource" 
@@ -276,7 +274,7 @@
                 <exclude name="**/*.jar"/>
             </fileset>
         </delete>
-        <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
         <delete dir="${war.deploy.dir}" failonerror="no"/>
     </target>
 
@@ -308,8 +306,7 @@
     
     <target name="undeploy" description="Undeploy the packaged archive">
         <delete file="${deploy.dir}/${project.name}.war" />
-        <delete file="${deploy.dir}/${project.name}-dev-ds.xml" />
-        <delete file="${deploy.dir}/${project.name}-prod-ds.xml" />
+        <delete file="${deploy.dir}/${project.name}-ds.xml" />
     </target>
 
     <target name="redeploy" depends="undeploy,clean,deploy"

Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml	2008-12-04 08:29:47 UTC (rev 9722)
+++ trunk/seam-gen/build-scripts/build.xml	2008-12-04 08:31:07 UTC (rev 9723)
@@ -254,11 +254,9 @@
 
     <target name="datasource">
         <fail unless="jboss.home">jboss.home not set</fail>
-        <copy todir="${deploy.dir}">
-            <fileset dir="${basedir}/resources">
-                <include name="${project.name}-${profile}-ds.xml"/>
-            </fileset>
-        </copy>
+        <copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
+            tofile="${deploy.dir}/${project.name}-ds.xml"
+            overwrite="true"/>
     </target>
 
     <target name="explode" depends="stage,datasource"
@@ -276,7 +274,7 @@
                 <exclude name="**/*.jar"/>
             </fileset>
         </delete>
-        <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
         <delete dir="${ear.deploy.dir}" failonerror="no"/>
     </target>
 
@@ -308,8 +306,7 @@
 
     <target name="undeploy" description="Undeploy the packaged archive">
         <delete file="${deploy.dir}/${project.name}.ear"/>
-        <delete file="${deploy.dir}/${project.name}-dev-ds.xml"/>
-        <delete file="${deploy.dir}/${project.name}-prod-ds.xml"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml"/>
     </target>
 
     <target name="redeploy" depends="undeploy,clean,deploy"

Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-12-04 08:29:47 UTC (rev 9722)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml	2008-12-04 08:31:07 UTC (rev 9723)
@@ -242,11 +242,9 @@
     
     <target name="datasource">
         <fail unless="jboss.home">jboss.home not set</fail>
-        <copy todir="${deploy.dir}">
-            <fileset dir="${basedir}/resources">
-                <include name="${project.name}-${profile}-ds.xml" />
-            </fileset>
-        </copy>
+        <copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
+            tofile="${deploy.dir}/${project.name}-ds.xml"
+            overwrite="true"/>
     </target>
     
     <target name="explode" depends="stage,datasource" 
@@ -265,7 +263,7 @@
                 <exclude name="**/*.jar"/>
             </fileset>
         </delete>
-        <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
         <delete dir="${war.deploy.dir}" failonerror="no"/>
     </target>
 
@@ -297,8 +295,7 @@
     
     <target name="undeploy" description="Undeploy the packaged archive">
         <delete file="${deploy.dir}/${project.name}.war" />
-        <delete file="${deploy.dir}/${project.name}-dev-ds.xml" />
-        <delete file="${deploy.dir}/${project.name}-prod-ds.xml" />
+        <delete file="${deploy.dir}/${project.name}-ds.xml" />
     </target>
 
     <target name="redeploy" depends="undeploy,clean,deploy"

Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml	2008-12-04 08:29:47 UTC (rev 9722)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml	2008-12-04 08:31:07 UTC (rev 9723)
@@ -244,11 +244,9 @@
 
     <target name="datasource">
         <fail unless="jboss.home">jboss.home not set</fail>
-        <copy todir="${deploy.dir}">
-            <fileset dir="${basedir}/resources">
-                <include name="${project.name}-${profile}-ds.xml"/>
-            </fileset>
-        </copy>
+        <copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
+            tofile="${deploy.dir}/${project.name}-ds.xml"
+            overwrite="true"/>
     </target>
 
     <target name="explode" depends="stage,datasource"
@@ -266,7 +264,7 @@
                 <exclude name="**/*.jar"/>
             </fileset>
         </delete>
-        <delete file="${deploy.dir}/${project.name}-${profile}-ds.xml" failonerror="no"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
         <delete dir="${ear.deploy.dir}" failonerror="no"/>
     </target>
 
@@ -298,8 +296,7 @@
 
     <target name="undeploy" description="Undeploy the packaged archive">
         <delete file="${deploy.dir}/${project.name}.ear"/>
-        <delete file="${deploy.dir}/${project.name}-dev-ds.xml"/>
-        <delete file="${deploy.dir}/${project.name}-prod-ds.xml"/>
+        <delete file="${deploy.dir}/${project.name}-ds.xml"/>
     </target>
 
     <target name="redeploy" depends="undeploy,clean,deploy"