[jboss-cvs] JBossAS SVN: r96956 - in trunk: client and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 25 10:14:26 EST 2009
Author: smarlow at redhat.com
Date: 2009-11-25 10:14:26 -0500 (Wed, 25 Nov 2009)
New Revision: 96956
Added:
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Player.java
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Soccer.java
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacade.java
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacadeBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/unit/
trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/unit/JPAUnitTestCase.java
trunk/testsuite/src/resources/ejb3/ejbthree7376/
trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/
trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/persistence.xml
Modified:
trunk/build/build.xml
trunk/client/pom.xml
trunk/component-matrix/pom.xml
trunk/deployment/pom.xml
trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
trunk/hibernate-int/pom.xml
trunk/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
trunk/server/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/ejb3.xml
trunk/testsuite/src/main/org/jboss/test/hibernate/mocks/MockRegion.java
trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
trunk/tomcat/pom.xml
Log:
JBAS-7241 Update to Entity Manager 3.5 and JPA 2. Next we need to fix JBMETA-233 on AS trunk
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/build/build.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -412,7 +412,7 @@
<include name="jcl-over-slf4j.jar"/>
<include name="cdi-api.jar"/>
<include name="concurrent.jar"/>
- <include name="ejb3-persistence.jar"/>
+ <include name="jpa-api.jar"/>
<include name="hibernate-annotations.jar"/>
<include name="hibernate-commons-annotations.jar"/>
<include name="hibernate-core.jar"/>
@@ -2007,11 +2007,10 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
- <fileset refid="org.hibernate:hibernate-jmx:jar"/>
<fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
- <fileset refid="org.hibernate:ejb3-persistence:jar"/>
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
+ <fileset refid="org.hibernate.java-persistence:jpa-api:jar"/>
<fileset refid="org.hibernate:hibernate-validator:jar"/>
<fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-deployers:jar"/>
@@ -2048,7 +2047,7 @@
<fileset refid="jacorb:jacorb:jar"/>
<fileset refid="jgroups:jgroups:jar"/>
<fileset refid="net.jcip:jcip-annotations:jar"/>
- <fileset refid="org.hibernate:hibernate-jbosscache2:jar"/>
+ <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
<mapper refid="remove-versions" />
@@ -2181,7 +2180,6 @@
<fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
<fileset refid="wscommons-policy:policy:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
- <fileset refid="org.hibernate:ejb3-persistence:jar"/>
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-validator:jar"/>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/client/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -21,8 +21,8 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/component-matrix/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -51,12 +51,14 @@
<version.jboss.web>3.0.0.alpha-19</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.junit>3.8.2</version.junit>
- <version.org.hibernate.annotations>3.4.0.GA</version.org.hibernate.annotations>
- <version.org.hibernate.commons.annotations>3.1.0.GA</version.org.hibernate.commons.annotations>
- <version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
+ <version.org.hibernate.annotations>3.5.0-Beta-2</version.org.hibernate.annotations>
+ <version.org.hibernate.commons.annotations>3.2.0.Beta1</version.org.hibernate.commons.annotations>
+ <version.org.hibernate.java-persistence>2.0-cr-1</version.org.hibernate.java-persistence>
+ <version.org.hibernate.jbosscache>3.5.0-Beta-2</version.org.hibernate.jbosscache>
<version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
- <version.org.hibernate.validator>4.0.0.CR1</version.org.hibernate.validator>
- <version.org.hibernate>3.3.1.GA</version.org.hibernate>
+ <version.org.hibernate.entity.manager>3.5.0-Beta-2</version.org.hibernate.entity.manager>
+ <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
+ <version.org.hibernate>3.5.0-Beta-2</version.org.hibernate>
<version.org.jboss.aop>2.1.3.GA</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.0.GA</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -80,6 +82,7 @@
<version.org.jboss.ejb3.common.client>1.0.1</version.org.jboss.ejb3.common.client>
<version.org.jboss.ejb3.core.client>1.1.21</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
+ <version.org.jboss.ejb3.jpa.int>2.0.0-alpha-1</version.org.jboss.ejb3.jpa.int>
<version.org.jboss.ejb3.proxy.impl.client>1.0.6</version.org.jboss.ejb3.proxy.impl.client>
<version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
<version.org.jboss.ejb3.proxy.clustered.client>1.0.2</version.org.jboss.ejb3.proxy.clustered.client>
@@ -88,12 +91,8 @@
<version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta1</version.org.jboss.jbossxb>
<version.org.jboss.jpa.deployers>1.0.1</version.org.jboss.jpa.deployers>
- <version.org.jboss.jpa.impl>1.0.0</version.org.jboss.jpa.impl>
+ <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
<version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
- <!-- FIXME: unpublished jpa versions break the build
- <version.org.jboss.jpa.deployers>1.0.1-20091014.133942-1</version.org.jboss.jpa.deployers>
- <version.org.jboss.jpa.impl>1.0.0-20091014.155826-1</version.org.jboss.jpa.impl>
- <version.org.jboss.jpa.spi>1.0.0-20091014.133355-1</version.org.jboss.jpa.spi -->
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
<version.org.jboss.logmanager>1.1.0.GA</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
@@ -1218,8 +1217,8 @@
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
- <version>${version.org.hibernate}</version>
+ <artifactId>hibernate-jbosscache</artifactId>
+ <version>${version.org.hibernate.jbosscache}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.cache</groupId>
@@ -1253,15 +1252,19 @@
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>${version.org.hibernate.ejb3.persistence}</version>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
+ <version>${version.org.hibernate.java-persistence}</version>
</dependency>
<dependency>
@@ -1290,6 +1293,12 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator-legacy</artifactId>
+ <version>${version.org.hibernate.validator}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-testing</artifactId>
<version>${version.org.hibernate}</version>
<scope>test</scope>
@@ -1528,6 +1537,12 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<version>${version.org.jboss.cache.core}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1831,6 +1846,12 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-jpa-int</artifactId>
+ <version>${version.org.jboss.ejb3.jpa.int}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-impl</artifactId>
<version>${version.org.jboss.ejb3.proxy.impl.client}</version>
<classifier>client</classifier>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/deployment/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -180,10 +180,10 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.mx</groupId>
<artifactId>jboss-j2se</artifactId>
Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -83,7 +83,7 @@
<value>javassist.jar</value>
<value>jboss-aop-jdk50.jar</value>
<value>jboss-aspect-library-jdk50.jar</value>
- <value>ejb3-persistence.jar</value>
+ <value>jpa-api.jar</value>
<value>commons-validator-1.1.3.jar</value>
<value>commons-collections.jar</value>
<value>commons-fileupload.jar</value>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/hibernate-int/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-jbosscache2</artifactId>
+ <artifactId>hibernate-jbosscache</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -115,4 +115,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- trunk/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -44,6 +44,7 @@
import org.hibernate.jmx.StatisticsServiceMBean;
import org.hibernate.transaction.JBossTransactionManagerLookup;
import org.hibernate.transaction.JTATransactionFactory;
+import org.hibernate.Version;
import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.beans.metadata.api.model.FromContext;
@@ -443,13 +444,13 @@
if ( getDeployedCacheJndiName() != null && getCacheRegionFactoryClass() == null)
{
// Implies shared cache region factory
- configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc2.JndiSharedJBossCacheRegionFactory.class.getName());
+ configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiSharedJBossCacheRegionFactory.class.getName());
}
if ( getDeployedCacheManagerJndiName() != null && getCacheRegionFactoryClass() == null)
{
// Implies multliplexed cache region factory
- configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory.class.getName());
+ configurationElements.put(Environment.CACHE_REGION_FACTORY, org.hibernate.cache.jbc.JndiMultiplexedJBossCacheRegionFactory.class.getName());
}
if (configurationElements.get(Environment.FLUSH_BEFORE_COMPLETION) == null)
@@ -508,8 +509,8 @@
setUnlessNull( settings, Environment.GENERATE_STATISTICS, ourConfig.remove(STAT_GENERATION_ENABLED) );
setUnlessNull( settings, Environment.DEFAULT_CATALOG, ourConfig.remove(DEFAULT_CATALOG) );
setUnlessNull( settings, Environment.USE_SECOND_LEVEL_CACHE, ourConfig.remove(SECOND_LEVEL_CACHE_ENABLED) );
- setUnlessNull( settings, org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_MANAGER_JNDI_NAME));
- setUnlessNull( settings, org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_JNDI_NAME));
+ setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_MANAGER_JNDI_NAME));
+ setUnlessNull( settings, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, ourConfig.remove(DEPLOYED_CACHE_JNDI_NAME));
// Set any remaining properties; presumably these are standard
// Hibernate configuration properties
@@ -695,7 +696,7 @@
public String getVersion()
{
- return Environment.VERSION;
+ return Version.getVersionString();
}
public SessionFactory getInstance()
@@ -973,7 +974,7 @@
*/
public String getDeployedCacheJndiName()
{
- return getConfigurationElementAsString(DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
+ return getConfigurationElementAsString(DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
}
/**
@@ -981,7 +982,7 @@
*/
public void setDeployedCacheJndiName(String name)
{
- setConfigurationElement( name, DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
+ setConfigurationElement( name, DEPLOYED_CACHE_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP);
}
/**
@@ -989,7 +990,7 @@
*/
public String getDeployedCacheManagerJndiName()
{
- return getConfigurationElementAsString(DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
+ return getConfigurationElementAsString(DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
}
/**
@@ -997,7 +998,7 @@
*/
public void setDeployedCacheManagerJndiName(String name)
{
- setConfigurationElement( name, DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
+ setConfigurationElement( name, DEPLOYED_CACHE_MANAGER_JNDI_NAME, org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP);
}
public Boolean getBatchVersionedDataEnabled()
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/server/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -277,6 +277,11 @@
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-deployment-spi</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.jpa</groupId>
@@ -376,10 +381,10 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/testsuite/build.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -273,11 +273,11 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
- <fileset refid="org.hibernate:ejb3-persistence:jar"/>
+ <fileset refid="org.hibernate.java-persistence:jpa-api:jar"/>
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
- <fileset refid="org.hibernate:hibernate-jbosscache2:jar"/>
+ <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
<fileset refid="org.hibernate:hibernate-testing:jar"/>
<fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
Modified: trunk/testsuite/imports/sections/ejb3.xml
===================================================================
--- trunk/testsuite/imports/sections/ejb3.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/testsuite/imports/sections/ejb3.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -37,6 +37,17 @@
<fileset dir="${source.resources}/ejb3/ejbthree1597" includes="**"></fileset>
</jar>
</target>
+
+ <target name="ejbthree7376" depends="compile">
+ <mkdir dir="${build.lib}"/>
+ <jar destfile="${build.lib}/ejbthree7376.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/test/ejb3/ejbthree7376/*.class"></fileset>
+ <fileset dir="${source.resources}/ejb3/ejbthree7376" includes="**">
+ <include name="META-INF/persistence.xml"/>
+ </fileset>
+
+ </jar>
+ </target>
<target name="ejb3-servlet" depends="compile"
description="Builds all jar files."
@@ -107,7 +118,7 @@
</jar>
</target>
- <target name="_jars-ejb3" depends="ejb3-servlet,jbas6161,jbas6239,ejbthree1597,jboss51xsd">
+ <target name="_jars-ejb3" depends="ejb3-servlet,jbas6161,jbas6239,ejbthree1597,ejbthree7376, jboss51xsd">
<mkdir dir="${build.lib}" />
<!-- A jar with a simple ejb3 session -->
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Player.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Player.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Player.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.AssertTrue;
+
+ at Entity
+ at Table(name = "SOCCER_PLAYER")
+
+public class Player implements java.io.Serializable {
+
+ @Size(max=32)
+ private String name;
+
+ @Size(max=32)
+ private String team;
+
+ @Max(100)
+ private int goals;
+
+ private int id;
+
+ private int version;
+
+ public Player()
+ {
+ }
+
+ public Player(int id, String name, String team, int goals)
+ {
+ this.id = id;
+ this.name = name;
+ this.team = team;
+ this.goals = goals;
+ }
+
+ @Id
+ @Column(name = "ID")
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @Version
+ @Column(name = "VERSION")
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+ @Column(length = 32, name = "NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(length = 32, name = "TEAM")
+ public String getTeam() {
+ return team;
+ }
+
+ public void setTeam(String team) {
+ this.team = team;
+ }
+
+ @Column(name = "GOALS")
+ public int getGoals() {
+ return goals;
+ }
+
+ public void setGoals(int goals) {
+ this.goals = goals;
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Soccer.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Soccer.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/Soccer.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376;
+
+import javax.ejb.Remote;
+
+/**
+ * @author Scott Marlow
+ *
+ */
+ at Remote
+public interface Soccer
+{
+ void addPlayer(int id, String name, String team, int goals);
+ Player getPlayer(int id);
+ Player getPlayerReadLock(int id);
+ Player getPlayerOptimisticLock(int id);
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerBean.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.PersistenceContext;
+
+/**
+ * @author Scott Marlow
+ *
+ */
+ at Stateless(mappedName="ejb3/ejbthree7376/Soccer")
+public class SoccerBean implements Soccer
+{
+ @PersistenceContext
+ private EntityManager em;
+
+ public void addPlayer(int id, String name, String team, int goals)
+ {
+
+ Player p = new Player(id, name, team, goals);
+ em.persist(p);
+ em.flush();
+ }
+
+ public Player getPlayer(int id)
+ {
+ Player p = em.find(Player.class, id);
+ return p;
+ }
+
+ public Player getPlayerReadLock(int id)
+ {
+ Player p = em.find(Player.class, id);
+ if(p != null)
+ em.lock(p, LockModeType.READ);
+ return p;
+ }
+
+ public Player getPlayerOptimisticLock(int id)
+ {
+ Player p = em.find(Player.class, id);
+ if(p != null)
+ em.lock(p, LockModeType.OPTIMISTIC);
+ return p;
+ }
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacade.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacade.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacade.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376;
+
+import javax.ejb.Remote;
+
+/**
+ * @author Scott Marlow
+ *
+ */
+ at Remote
+public interface SoccerFacade
+{
+ void addPlayer(int id, String name, String team, int goals);
+ Player getPlayer(int id);
+ Player getPlayerReadLock(int id);
+ Player getPlayerOptimisticLock(int id);
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacadeBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacadeBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/SoccerFacadeBean.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+
+
+/**
+ * @author Scott Marlow
+ *
+ */
+ at Stateless(mappedName="ejb3/ejbthree7376/SoccerFacade")
+public class SoccerFacadeBean implements SoccerFacade
+{
+ @EJB
+ private Soccer stats = null;
+
+ public void addPlayer(int id, String name, String team, int goals)
+ {
+ stats.addPlayer(id, name, team, goals);
+ }
+
+ public Player getPlayer(int id)
+ {
+ return stats.getPlayer(id);
+ }
+
+ public Player getPlayerReadLock(int id)
+ {
+ return stats.getPlayerReadLock(id);
+ }
+
+ public Player getPlayerOptimisticLock(int id)
+ {
+ return stats.getPlayerOptimisticLock(id);
+ }
+}
Added: trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/unit/JPAUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/unit/JPAUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/ejbthree7376/unit/JPAUnitTestCase.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.ejbthree7376.unit;
+
+import javax.naming.InitialContext;
+import javax.validation.ConstraintViolationException;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb3.ejbthree7376.Player;
+import org.jboss.test.ejb3.ejbthree7376.SoccerFacade;
+
+
+/**
+ * JPA 2 testing
+ *
+ * @author Scott Marlow
+ */
+public class JPAUnitTestCase extends JBossTestCase
+{
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(JPAUnitTestCase.class, "ejbthree7376.jar");
+ }
+
+ public JPAUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testJPA() throws Exception
+ {
+ getLog().info("testJPA start");
+ InitialContext ctx = this.getInitialContext();
+ SoccerFacade stats = (SoccerFacade) ctx.lookup("ejb3/ejbthree7376/SoccerFacade");
+ getLog().info("testJPA about to add player");
+ stats.addPlayer(0,"Heather Mitts","Boston Breakers", 0); // 2009 season
+ getLog().info("testJPA player added. About to look up player");
+ Player p = stats.getPlayer(0);
+ assertNotNull("player is null" , p);
+ assertEquals(p.getName(), "Heather Mitts");
+ assertEquals(p.getTeam(), "Boston Breakers");
+ getLog().info("testJPA end");
+ }
+
+ public void testJPABeanValidation() throws Exception
+ {
+ getLog().info("testJPABeanValidation start");
+ InitialContext ctx = this.getInitialContext();
+ SoccerFacade stats = (SoccerFacade) ctx.lookup("ejb3/ejbthree7376/SoccerFacade");
+ try {
+ stats.addPlayer(1, "Christine Lily","Boston Breakers", 9999); // should be invalid number of goals
+ fail("failed to throw ConstraintViolationException");
+ }
+ catch(ConstraintViolationException expected)
+ {
+ // expected path
+ }
+
+ getLog().info("testJPABeanValidation ended");
+ }
+
+ public void testJPAReadLock() throws Exception
+ {
+ getLog().info("testJPA start");
+ InitialContext ctx = this.getInitialContext();
+ SoccerFacade stats = (SoccerFacade) ctx.lookup("ejb3/ejbthree7376/SoccerFacade");
+ getLog().info("testJPA about to add player");
+ stats.addPlayer(2,"Fabiana","Boston Breakers", 5); // 2009 season
+ assertNotNull("player is null", stats.getPlayer(2));
+ getLog().info("testJPA player added. About to look up player");
+ Player p = stats.getPlayerReadLock(2);
+ assertNotNull("player is null" , p);
+ assertEquals(p.getName(), "Fabiana");
+ assertEquals(p.getTeam(), "Boston Breakers");
+ getLog().info("testJPA end");
+ }
+
+ public void testJPAOptimisticLock() throws Exception
+ {
+ getLog().info("testJPA start");
+ InitialContext ctx = this.getInitialContext();
+ SoccerFacade stats = (SoccerFacade) ctx.lookup("ejb3/ejbthree7376/SoccerFacade");
+ getLog().info("testJPA about to add player");
+ stats.addPlayer(3,"Kelly Smith","Boston Breakers", 10); // 2009 season
+ assertNotNull("player is null", stats.getPlayer(3));
+ getLog().info("testJPA player added. About to look up player");
+ Player p = stats.getPlayerOptimisticLock(3);
+ assertNotNull("player is null" , p);
+ assertEquals(p.getName(), "Kelly Smith");
+ assertEquals(p.getTeam(), "Boston Breakers");
+ getLog().info("testJPA end");
+
+ }
+
+
+}
Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/mocks/MockRegion.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/mocks/MockRegion.java 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/mocks/MockRegion.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -111,4 +111,9 @@
return null;
}
+ public boolean contains(Object key)
+ {
+ return false;
+ }
+
}
Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateConfigurationUnitTestCase.java 2009-11-25 15:14:26 UTC (rev 96956)
@@ -150,7 +150,7 @@
Set<BaseNamedElement> config = new HashSet<BaseNamedElement>();
config.add(createBaseNamedElement(Environment.TRANSACTION_MANAGER_STRATEGY, TransactionManagerLookupImpl.class.getName()));
config.add(createBaseNamedElement(Environment.USER_TRANSACTION, JTATransactionFactory.DEFAULT_USER_TRANSACTION_NAME));
- config.add(createBaseNamedElement(org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+ config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
testee.setConfigurationElements(config);
testee.start();
@@ -197,9 +197,9 @@
config.add(createBaseNamedElement(Environment.PASS, "Brian"));
config.add(createBaseNamedElement(Environment.USE_STREAMS_FOR_BINARY, Boolean.TRUE));
config.add(createBaseNamedElement(Environment.USE_REFLECTION_OPTIMIZER, Boolean.TRUE));
- config.add(createBaseNamedElement(org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, "java:/test/Cache"));
- config.add(createBaseNamedElement(org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, "java:/test/CacheManager"));
- config.add(createBaseNamedElement(org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+ config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP, "java:/test/Cache"));
+ config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP, "java:/test/CacheManager"));
+ config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
testee.setConfigurationElements(config);
testee.start();
@@ -249,7 +249,7 @@
config.add(createBaseNamedElement("reflectionOptimizationEnabled", Boolean.TRUE));
config.add(createBaseNamedElement("deployedCacheJndiName", "java:/test/Cache"));
config.add(createBaseNamedElement("deployedCacheManagerJndiName", "java:/test/CacheManager"));
- config.add(createBaseNamedElement(org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
+ config.add(createBaseNamedElement(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP, "entities-test"));
testee.setConfigurationElements(config);
testee.start();
@@ -308,9 +308,9 @@
assertEquals("Brian", props.getProperty(Environment.PASS));
assertEquals("true", props.getProperty(Environment.USE_STREAMS_FOR_BINARY));
assertEquals("true", props.getProperty(Environment.USE_REFLECTION_OPTIMIZER));
- assertEquals("java:/test/Cache", props.getProperty(org.hibernate.cache.jbc2.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP));
- assertEquals("java:/test/CacheManager", props.getProperty(org.hibernate.cache.jbc2.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP));
- assertEquals("entities-test", props.getProperty(org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP));
+ assertEquals("java:/test/Cache", props.getProperty(org.hibernate.cache.jbc.builder.JndiSharedCacheInstanceManager.CACHE_RESOURCE_PROP));
+ assertEquals("java:/test/CacheManager", props.getProperty(org.hibernate.cache.jbc.builder.JndiMultiplexingCacheInstanceManager.CACHE_FACTORY_RESOURCE_PROP));
+ assertEquals("entities-test", props.getProperty(org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager.ENTITY_CACHE_RESOURCE_PROP));
}
private static BaseNamedElement createBaseNamedElement(String name, Object value)
Added: trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/ejb-jar.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ version="3.0">
+ <assembly-descriptor>
+ <application-exception>
+ <exception-class>javax.validation.ConstraintViolationException</exception-class>
+ <rollback>true</rollback>
+ </application-exception>
+ </assembly-descriptor>
+</ejb-jar>
\ No newline at end of file
Added: trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/persistence.xml
===================================================================
--- trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/persistence.xml (rev 0)
+++ trunk/testsuite/src/resources/ejb3/ejbthree7376/META-INF/persistence.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -0,0 +1,15 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+
+ <persistence-unit name="ejbthree7376">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ <validation-mode>AUTO</validation-mode>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-11-25 15:04:49 UTC (rev 96955)
+++ trunk/tomcat/pom.xml 2009-11-25 15:14:26 UTC (rev 96956)
@@ -307,8 +307,8 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
More information about the jboss-cvs-commits
mailing list