[seam-commits] Seam SVN: r10536 - in branches/community/Seam_2_1/seam-gen: resources and 1 other directories.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-04-20 16:43:53 -0400 (Mon, 20 Apr 2009)
New Revision: 10536

Modified:
   branches/community/Seam_2_1/seam-gen/build.xml
   branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev-war.xml
   branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev.xml
   branches/community/Seam_2_1/seam-gen/resources/datasource-ds.xml
Log:
JBIDE-4183 unbreak tests in JBDS


Modified: branches/community/Seam_2_1/seam-gen/build.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/build.xml	2009-04-20 12:41:11 UTC (rev 10535)
+++ branches/community/Seam_2_1/seam-gen/build.xml	2009-04-20 20:43:53 UTC (rev 10536)
@@ -875,6 +875,7 @@
         </copy>
         <replace file="${project.home}/resources/META-INF/persistence-dev.xml">
             <replacefilter token="org.hibernate.transaction.JBossTransactionManagerLookup" value="@transactionManagerLookupClass@"/>
+            <replacefilter token="&lt;jta-data-source&gt;java:/" value="&lt;jta-data-source&gt;"/>
         </replace>
         <copy tofile="${project.home}/resources/WEB-INF/components.xml"
                 file="${templates.dir}/resources/WEB-INF/components-war-tokenized.xml">
@@ -1068,6 +1069,12 @@
             <filterset refid="jdbc"/>
         </copy>
 
+        <replace dir="${project.home}/resources">
+            <include name="*-ds.xml"/>
+            <replacetoken><![CDATA[<use-java-context>true</use-java-context>]]></replacetoken>
+            <replacevalue><![CDATA[<use-java-context>false</use-java-context>]]></replacevalue>
+        </replace>
+
         <copy tofile="${project.home}/resources/glassfish-resources-dev.xml"
                 file="${templates.dir}/resources/glassfish-resources.xml">
             <filterset refid="project"/>

Modified: branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev-war.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev-war.xml	2009-04-20 12:41:11 UTC (rev 10535)
+++ branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev-war.xml	2009-04-20 20:43:53 UTC (rev 10536)
@@ -7,7 +7,7 @@
              
    <persistence-unit name="@projectName@" transaction-type="JTA">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <jta-data-source>@projectName at Datasource</jta-data-source>
+      <jta-data-source>java:/@projectName at Datasource</jta-data-source>
       <properties>
          <property name="hibernate.dialect" value="@hibernate.dialect@"/>
          <property name="hibernate.hbm2ddl.auto" value="@hbm2ddl@"/>

Modified: branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev.xml	2009-04-20 12:41:11 UTC (rev 10535)
+++ branches/community/Seam_2_1/seam-gen/resources/META-INF/persistence-dev.xml	2009-04-20 20:43:53 UTC (rev 10536)
@@ -7,7 +7,7 @@
              
    <persistence-unit name="@projectName@">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <jta-data-source>@projectName at Datasource</jta-data-source>
+      <jta-data-source>java:/@projectName at Datasource</jta-data-source>
       <!-- The <jar-file> element is necessary if you put the persistence.xml in the WAR and the classes in the JAR -->
       <!--
       <jar-file>../../vehicles.jar</jar-file>

Modified: branches/community/Seam_2_1/seam-gen/resources/datasource-ds.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/resources/datasource-ds.xml	2009-04-20 12:41:11 UTC (rev 10535)
+++ branches/community/Seam_2_1/seam-gen/resources/datasource-ds.xml	2009-04-20 20:43:53 UTC (rev 10536)
@@ -6,7 +6,7 @@
    
    <local-tx-datasource>
       <jndi-name>@projectName at Datasource</jndi-name>
-      <use-java-context>false</use-java-context>
+      <use-java-context>true</use-java-context>
       <connection-url>@jdbcUrl@</connection-url>
       <driver-class>@driverClass@</driver-class>
       <user-name>@username@</user-name>