[jboss-cvs] JBossAS SVN: r95721 - branches/Branch_5_x/tools/etc/buildmagic.

[jboss-cvs-commits at lists.jboss.org]

Author: smarlow at redhat.com
Date: 2009-10-28 22:00:56 -0400 (Wed, 28 Oct 2009)
New Revision: 95721

Modified:
   branches/Branch_5_x/tools/etc/buildmagic/libraries.ent
Log:
JBAS-7241 Update to Entity Manager 3.5 and JPA 2. Fix for  maven build

Modified: branches/Branch_5_x/tools/etc/buildmagic/libraries.ent
===================================================================
--- branches/Branch_5_x/tools/etc/buildmagic/libraries.ent	2009-10-29 01:53:58 UTC (rev 95720)
+++ branches/Branch_5_x/tools/etc/buildmagic/libraries.ent	2009-10-29 02:00:56 UTC (rev 95721)
@@ -52,7 +52,7 @@
   <property name="hibernate.entitymanager.root" value="${project.thirdparty}/hibernate"/>
   <property name="hibernate.entitymanager.lib" value="${hibernate.entitymanager.root}/lib"/>
   <path id="hibernate.entitymanager.classpath">
-    <pathelement path="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/>
+    <!-- pathelement path="${hibernate.entitymanager.lib}/ejb3-persistence.jar"/ -->
     <pathelement path="${hibernate.entitymanager.lib}/hibernate-entitymanager.jar"/>
   </path>
   
@@ -77,9 +77,16 @@
   <path id="ejb3-persistence.classpath">
     <pathelement path="${hibernate.lib}/hibernate-annotations.jar"/>
     <pathelement path="${hibernate.lib}/hibernate-entitymanager.jar"/>
-    <pathelement path="${hibernate.lib}/ejb3-persistence.jar"/>
   </path>
 
+  <!-- JPA 2 -->
+  <property name="jpa.root" value="${project.thirdparty}/hibernate-entitymanager"/>
+  <property name="jpa.lib" value="${jpa.root}/lib"/>
+  <path id="jpa.classpath">
+    <pathelement path="${jpa.lib}/jpa-api.jar"/>
+    <pathelement path="${jpa.lib}/hibernate-entitymanager.jar"/>
+  </path>
+
   <!-- ODMG (needed for Hibernate) -->
   <property name="odmg.root" value="${project.thirdparty}/odmg"/>
   <property name="odmg.lib" value="${odmg.root}/lib"/>