[seam-commits] Seam SVN: r8554 - in trunk/seam-gen: resources and 1 other directory.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Aug 1 00:20:00 EDT 2008


Author: jacob.orshalick
Date: 2008-08-01 00:20:00 -0400 (Fri, 01 Aug 2008)
New Revision: 8554

Added:
   trunk/seam-gen/resources/components-dev.properties
   trunk/seam-gen/resources/components-prod.properties
   trunk/seam-gen/resources/components-test.properties
Removed:
   trunk/seam-gen/resources/components.properties
Modified:
   trunk/seam-gen/build-scripts/build-war.xml
   trunk/seam-gen/build-scripts/build.xml
Log:
JBSEAM-3157

Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml	2008-08-01 03:52:09 UTC (rev 8553)
+++ trunk/seam-gen/build-scripts/build-war.xml	2008-08-01 04:20:00 UTC (rev 8554)
@@ -144,7 +144,11 @@
                 <include name="*.drl" />
             </fileset>
         </copy>
-        
+
+        <copy tofile="${war.dir}/components.properties" 
+              file="${basedir}/resources/components-${profile}.properties"
+              overwrite="true"/>
+
         <copy tofile="${war.dir}/WEB-INF/classes/META-INF/persistence.xml" 
               file="${basedir}/resources/META-INF/persistence-${profile}-war.xml"
               overwrite="true"/>
@@ -164,10 +168,6 @@
                 <exclude name="classes/**/*.class"/>
                 <exclude name="classes/**/*.groovy"/>
             </fileset>
-            <filterset>
-                <filter token="debug"       value="${debug}" />
-                <filter token="jndiPattern" value="${project.name}/#{ejbName}/local"/>
-            </filterset>
         </copy>
         
         <copy todir="${war.dir}/WEB-INF">
@@ -300,6 +300,7 @@
                 <exclude name="META-INF/persistence*.xml"/>
                 <exclude name="import*.sql"/>
                 <exclude name="${project.name}-*-ds.xml"/>
+                <exclude name="components-*.properties"/>
             </fileset>
         </copy>
         <copy tofile="${test.dir}/META-INF/persistence.xml" 
@@ -308,6 +309,9 @@
         <copy tofile="${test.dir}/import.sql" 
               file="${basedir}/resources/import-test.sql"
               overwrite="true"/>
+        <copy tofile="${test.dir}/components.properties" 
+              file="${basedir}/resources/components-test.properties"
+              overwrite="true"/>
         <copy todir="${test.dir}" flatten="true">
             <fileset dir="${src.test.dir}">
                 <include name="**/*Test.xml" />

Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml	2008-08-01 03:52:09 UTC (rev 8553)
+++ trunk/seam-gen/build-scripts/build.xml	2008-08-01 04:20:00 UTC (rev 8554)
@@ -102,16 +102,15 @@
                 <copy todir="${war.dir}">
                         <fileset dir="${basedir}/view" />
                 </copy>
+                <copy tofile="${war.dir}/components.properties" 
+                      file="${basedir}/resources/components-${profile}.properties"
+                      overwrite="true"/>
                 <copy todir="${war.dir}/WEB-INF">
                         <fileset dir="${basedir}/resources/WEB-INF">
                                 <include name="*.*"/>
                                 <include name="classes/**/*.*"/>
                                 <exclude name="classes/**/*.class"/>
                         </fileset>
-                        <filterset>
-                            <filter token="debug" value="${debug}" />
-                            <filter token="jndiPattern" value="${project.name}/#{ejbName}/local" />
-                        </filterset>
                 </copy>         
                 <copy todir="${war.dir}/WEB-INF">
                         <fileset dir="${basedir}/resources/WEB-INF">
@@ -274,6 +273,7 @@
                                 <exclude name="META-INF/persistence*.xml"/>
                                 <exclude name="import*.sql"/>
                                 <exclude name="${project.name}-*-ds.xml"/>
+                                <exclude name="components-*.properties"/>
                         </fileset>
                 </copy>
                 <copy tofile="${test.dir}/META-INF/persistence.xml" 
@@ -282,6 +282,9 @@
                 <copy tofile="${test.dir}/import.sql" 
                         file="${basedir}/resources/import-test.sql"
                    overwrite="true"/>
+                <copy tofile="${test.dir}/components.properties" 
+                        file="${basedir}/resources/components-test.properties"
+                   overwrite="true"/>
                 <copy todir="${test.dir}" flatten="true">
                         <fileset dir="${src.test.dir}">
                                 <include name="**/*Test.xml" />

Added: trunk/seam-gen/resources/components-dev.properties
===================================================================
--- trunk/seam-gen/resources/components-dev.properties	                        (rev 0)
+++ trunk/seam-gen/resources/components-dev.properties	2008-08-01 04:20:00 UTC (rev 8554)
@@ -0,0 +1,4 @@
+# The pattern in components.xml is replaced by an application server specific value in the ant build. This value is used for running tests
+
+jndiPattern \#{ejbName}/local
+debug true

Added: trunk/seam-gen/resources/components-prod.properties
===================================================================
--- trunk/seam-gen/resources/components-prod.properties	                        (rev 0)
+++ trunk/seam-gen/resources/components-prod.properties	2008-08-01 04:20:00 UTC (rev 8554)
@@ -0,0 +1,4 @@
+# The pattern in components.xml is replaced by an application server specific value in the ant build. This value is used for running tests
+
+jndiPattern \#{ejbName}/local
+debug false

Added: trunk/seam-gen/resources/components-test.properties
===================================================================
--- trunk/seam-gen/resources/components-test.properties	                        (rev 0)
+++ trunk/seam-gen/resources/components-test.properties	2008-08-01 04:20:00 UTC (rev 8554)
@@ -0,0 +1,4 @@
+# The pattern in components.xml is replaced by an application server specific value in the ant build. This value is used for running tests
+
+jndiPattern \#{ejbName}/local
+debug true

Deleted: trunk/seam-gen/resources/components.properties
===================================================================
--- trunk/seam-gen/resources/components.properties	2008-08-01 03:52:09 UTC (rev 8553)
+++ trunk/seam-gen/resources/components.properties	2008-08-01 04:20:00 UTC (rev 8554)
@@ -1,4 +0,0 @@
-# The pattern in components.xml is replaced by an application server specific value in the ant build. This value is used for running tests
-
-jndiPattern \#{ejbName}/local
-debug true




More information about the seam-commits mailing list