[jboss-cvs] JBossAS SVN: r77544 - in trunk: server and 2 other directories.

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

Author: smcgowan at redhat.com
Date: 2008-08-27 14:25:50 -0400 (Wed, 27 Aug 2008)
New Revision: 77544

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/build.xml
   trunk/thirdparty/pom.xml
   trunk/tomcat/build.xml
Log:
JBAS-5877 - upgrade jboss-javaee.jar for CR2

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-08-27 17:04:21 UTC (rev 77543)
+++ trunk/component-matrix/pom.xml	2008-08-27 18:25:50 UTC (rev 77544)
@@ -66,7 +66,7 @@
     <version.org.jboss.naming>5.0.0.CR2</version.org.jboss.naming>
     <version.org.jboss.security>2.0.2.CR6</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
-    <version.suffix.org.jboss.javaee>.CR1</version.suffix.org.jboss.javaee>
+    <version.suffix.org.jboss.javaee>.CR2</version.suffix.org.jboss.javaee>
     <version.org.springframework>2.5.5</version.org.springframework>
     <version.sun-jaxws>2.1.1</version.sun-jaxws>
     <version.xdoclet>1.2.3</version.xdoclet>
@@ -1545,12 +1545,6 @@
       
       <dependency>
         <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-persistence-api</artifactId>
-        <version>3.0.0${version.suffix.org.jboss.javaee}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-servlet-api</artifactId>
         <version>2.5.0${version.suffix.org.jboss.javaee}</version>
       </dependency>

Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml	2008-08-27 17:04:21 UTC (rev 77543)
+++ trunk/server/build.xml	2008-08-27 18:25:50 UTC (rev 77544)
@@ -106,7 +106,7 @@
     &modules;
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-      <!--path refid="ejb3-persistence.classpath"/-->
+      <path refid="hibernate.entitymanager.classpath"/>
       <path refid="jboss.jboss.javaee.classpath"/>
       <path refid="jboss.jboss.jaspi.api.classpath"/>
       <path refid="jboss.common.core.classpath"/>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-08-27 17:04:21 UTC (rev 77543)
+++ trunk/thirdparty/pom.xml	2008-08-27 18:25:50 UTC (rev 77544)
@@ -1397,10 +1397,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-persistence-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-servlet-api</artifactId>
     </dependency>
     <dependency>

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2008-08-27 17:04:21 UTC (rev 77543)
+++ trunk/tomcat/build.xml	2008-08-27 18:25:50 UTC (rev 77544)
@@ -87,6 +87,7 @@
     <!-- The combined dependent module classpath -->
     &modules;
     <path id="dependentmodule.classpath">
+      <path refid="hibernate.entitymanager.classpath"/>
       <path refid="jboss.jboss.javaee.classpath"/>
       <path refid="jboss.jboss.jaspi.api.classpath"/>
       <path refid="jboss.main.classpath"/>