[seam-commits] Seam SVN: r8555 - in trunk/seam-gen: resources and 1 other directory.
Author: jacob.orshalick
Date: 2008-08-01 01:21:35 -0400 (Fri, 01 Aug 2008)
New Revision: 8555
Modified:
trunk/seam-gen/build.xml
trunk/seam-gen/resources/components-dev.properties
trunk/seam-gen/resources/components-prod.properties
Log:
JBSEAM-3157 fix for JNDI naming pattern differences between integration test and server
deployment
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-08-01 04:20:00 UTC (rev 8554)
+++ trunk/seam-gen/build.xml 2008-08-01 05:21:35 UTC (rev 8555)
@@ -715,11 +715,21 @@
<copy tofile="${project.home}/seam-gen.properties"
file="./build.properties"/>
-
+
+ <copy todir="${project.home}/resources/">
+ <fileset dir="${basedir}/resources/">
+ <include name="components-*.properties"/>
+ </fileset>
+ <filterset>
+ <filter token="projectName" value="${project.name}"
/>
+ </filterset>
+ </copy>
+
<copy todir="${project.home}/resources">
<fileset dir="${base.dir}/resources/">
<exclude name="datasource-ds.xml"/>
<exclude name="import.sql"/>
+ <exclude name="components-*.properties"/>
<exclude name="WEB-INF/components*.xml"/>
<exclude name="META-INF/persistence*.xml"/>
<exclude name="META-INF/application.xml"/>
Modified: trunk/seam-gen/resources/components-dev.properties
===================================================================
--- trunk/seam-gen/resources/components-dev.properties 2008-08-01 04:20:00 UTC (rev 8554)
+++ trunk/seam-gen/resources/components-dev.properties 2008-08-01 05:21:35 UTC (rev 8555)
@@ -1,4 +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
+jndiPattern @projectName@/\#{ejbName}/local
debug true
Modified: trunk/seam-gen/resources/components-prod.properties
===================================================================
--- trunk/seam-gen/resources/components-prod.properties 2008-08-01 04:20:00 UTC (rev
8554)
+++ trunk/seam-gen/resources/components-prod.properties 2008-08-01 05:21:35 UTC (rev
8555)
@@ -1,4 +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
+jndiPattern @projectName@/\#{ejbName}/local
debug false