[seam-commits] Seam SVN: r14939 - in branches/community/Seam_2_3/jboss-seam-gen/dist: resources and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-06-21 03:44:01 -0400 (Thu, 21 Jun 2012)
New Revision: 14939

Modified:
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/resources/components-test.properties
Log:
updated jndiPattern property for AS7

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-06-21 07:43:43 UTC (rev 14938)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-06-21 07:44:01 UTC (rev 14939)
@@ -64,10 +64,8 @@
             <istrue value="${debug}"/>
         </condition>
         <property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
-        <property name="ejbJndiPattern" value="${project.name}/#{ejbName}/local"/>
-        <condition property="seamBootstrapsPu" value="false" else="true">
-            <available file="${jboss.home}/lib/jboss-vfs.jar"/> <!-- JBoss AS >= 5.0 -->
-        </condition>
+        <property name="ejbJndiPattern" value="java:app/${project.name}-ejb/#{ejbName}"/>
+        <property name="seamBootstrapsPu" value="false" />
         <condition property="seamEmfRef" value="#{entityManagerFactory}" else="#{null}">
             <istrue value="${seamBootstrapsPu}"/>
         </condition>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-06-21 07:43:43 UTC (rev 14938)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-06-21 07:44:01 UTC (rev 14939)
@@ -64,7 +64,7 @@
             <istrue value="${debug}"/>
         </condition>
         <property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
-        <property name="ejbJndiPattern" value="${project.name}/#{ejbName}/local"/>
+        <property name="ejbJndiPattern" value="java:app/${project.name}-ejb/#{ejbName}"/>
         <property name="seamBootstrapsPu" value="false"/>
         <property name="seamEmfRef" value="#{null}"/>
         <property name="puJndiName" value="java:/${project.name}EntityManagerFactory"/>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/resources/components-test.properties
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/resources/components-test.properties	2012-06-21 07:43:43 UTC (rev 14938)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/resources/components-test.properties	2012-06-21 07:44:01 UTC (rev 14939)
@@ -1,5 +1,5 @@
 # These properties are used to replace Ant-style tokens in the component descriptor (components.xml) at runtime.
-jndiPattern=#{ejbName}/local
+jndiPattern=@ejbJndiPattern@
 debug=true
 seamBootstrapsPu=true
 seamEmfRef=#{entityManagerFactory}