Author: pete.muir(a)jboss.org Date: 2009-08-18 08:32:17 -0400 (Tue, 18 Aug 2009) New Revision: 11398 Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml Log: JBDS-828, JBSEAM-4276 Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml =================================================================== --- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 11:36:14 UTC (rev 11397) +++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-dev-war.xml 2009-08-18 12:32:17 UTC (rev 11398) @@ -13,8 +13,7 @@ <property name="hibernate.hbm2ddl.auto" value="@hbm2ddl@"/> <property name="hibernate.show_sql" value="true"/> <property name="hibernate.format_sql" value="true"/>@catalogProperty@@schemaProperty@ - <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) --> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> + <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/> </properties> </persistence-unit> Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml =================================================================== --- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 11:36:14 UTC (rev 11397) +++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-prod-war.xml 2009-08-18 12:32:17 UTC (rev 11398) @@ -12,8 +12,7 @@ <property name="hibernate.dialect" value=&quot;@hibernate.dialect(a)&quot;/&gt; <property name="hibernate.hbm2ddl.auto" value="validate"/> <property name="hibernate.jdbc.batch_size" value="20"/>@catalogProperty@@schemaProperty@ - <!-- Only relevant if Seam is loading the persistence unit (Java SE bootstrap) --> - <property name="hibernate.transaction.manager_lookup_class" value="@transactionManagerLookupClass@"/> + <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/> </properties> </persistence-unit> Modified: branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml =================================================================== --- branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 11:36:14 UTC (rev 11397) +++ branches/community/Seam_2_2/seam-gen/resources/META-INF/persistence-test-war.xml 2009-08-18 12:32:17 UTC (rev 11398) @@ -12,7 +12,7 @@ <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> <property name="hibernate.cache.use_second_level_cache" value="false"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> + <property name="jboss.entity.manager.factory.jndi.name" value="java:/@projectName@EntityManagerFactory"/> </properties> </persistence-unit> Modified: branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml =================================================================== --- branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 11:36:14 UTC (rev 11397) +++ branches/community/Seam_2_2/seam-gen/resources/WEB-INF/components-war.xml 2009-08-18 12:32:17 UTC (rev 11398) @@ -36,7 +36,7 @@ <!-- entity-manager-factory="#{entityManagerFactory}"/>--> <persistence:managed-persistence-context name="entityManager" auto-create="true" - persistence-unit-jndi-name="@projectName@"/> + persistence-unit-jndi-name="@projectName@EntityManagerFactory"/> <drools:rule-base name="securityRules"> <drools:rule-files><value>/security.drl</value></drools:rule-files>