[jboss-cvs] JBossAS SVN: r96015 - in projects/jpa/trunk: impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 4 16:28:19 EST 2009
Author: smarlow at redhat.com
Date: 2009-11-04 16:28:18 -0500 (Wed, 04 Nov 2009)
New Revision: 96015
Modified:
projects/jpa/trunk/build/pom.xml
projects/jpa/trunk/impl/pom.xml
projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/AbstractEntityManagerFactoryDelegator.java
projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java
projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/tx/TransactionScopedEntityManager.java
projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java
Log:
JBJPA-15: use updated jpa 2 interfaces (jpa-api:2.0-cr-1) and Hibernate 3.5.0-Beta-2
Modified: projects/jpa/trunk/build/pom.xml
===================================================================
--- projects/jpa/trunk/build/pom.xml 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/build/pom.xml 2009-11-04 21:28:18 UTC (rev 96015)
@@ -134,8 +134,8 @@
<properties>
<JPA.groupId>org.hibernate.persistence</JPA.groupId>
<JPA.artifactId>jpa-api</JPA.artifactId>
- <JPA.version>2.0.Beta-20090815</JPA.version>
- <version.org.hibernate.hibernate-entitymanager>3.5.0.Beta-1</version.org.hibernate.hibernate-entitymanager>
+ <JPA.version>2.0-cr-1</JPA.version>
+ <version.org.hibernate.hibernate-entitymanager>3.5.0-Beta-2</version.org.hibernate.hibernate-entitymanager>
</properties>
</profile>
</profiles>
Modified: projects/jpa/trunk/impl/pom.xml
===================================================================
--- projects/jpa/trunk/impl/pom.xml 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/impl/pom.xml 2009-11-04 21:28:18 UTC (rev 96015)
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.5.0.Beta-1</version>
+ <version>3.5.0-Beta-2</version>
</dependency>
<!--
<dependency>
Modified: projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/AbstractEntityManagerFactoryDelegator.java
===================================================================
--- projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/AbstractEntityManagerFactoryDelegator.java 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/AbstractEntityManagerFactoryDelegator.java 2009-11-04 21:28:18 UTC (rev 96015)
@@ -28,7 +28,6 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.criteria.QueryBuilder;
import javax.persistence.metamodel.Metamodel;
/**
@@ -71,16 +70,11 @@
return getDelegate().getProperties();
}
- public QueryBuilder getQueryBuilder()
+ public javax.persistence.criteria.CriteriaBuilder getCriteriaBuilder()
{
- return getDelegate().getQueryBuilder();
+ return getDelegate().getCriteriaBuilder();
}
- public Set<String> getSupportedProperties()
- {
- return getDelegate().getSupportedProperties();
- }
-
public boolean isOpen()
{
return getDelegate().isOpen();
Modified: projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java
===================================================================
--- projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java 2009-11-04 21:28:18 UTC (rev 96015)
@@ -31,8 +31,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.persistence.Caching;
import javax.persistence.ValidationMode;
+import javax.persistence.SharedCacheMode;
import javax.persistence.spi.ClassTransformer;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -41,7 +41,6 @@
import org.hibernate.ejb.HibernatePersistence;
import org.jboss.logging.Logger;
import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
-import org.jboss.metadata.jpa.spec.SharedCacheMode;
import org.jboss.metadata.jpa.spec.TransactionType;
/**
@@ -68,8 +67,8 @@
private URL persistenceUnitRootUrl;
private boolean excludeClasses;
private ValidationMode validationMode;
- private Caching caching;
private String persistenceXMLSchemaVersion;
+ private SharedCacheMode sharedCacheMode;
public PersistenceUnitInfoImpl()
{
@@ -102,11 +101,10 @@
this.setPersistenceUnitRootUrl(persistenceUnitRootUrl);
PersistenceUnitTransactionType transactionType = getJPATransactionType(metaData);
this.setTransactionType(transactionType);
- this.setCaching( convertToCaching( metaData.getSharedCacheMode() ) );
this.setValidationMode( convertToValidationMode( metaData.getValidationMode() ) );
//FIXME set appropriate version when accessible from metadata
this.setPersistenceXMLSchemaVersion( null);
-
+ this.setSharedCacheMode(getSharedCacheMode(metaData.getSharedCacheMode()));
if (metaData.getProvider() != null) this.setPersistenceProviderClassName(metaData.getProvider());
/*
if (explicitEntityClasses.size() > 0)
@@ -153,6 +151,21 @@
*/
}
+ private SharedCacheMode getSharedCacheMode(org.jboss.metadata.jpa.spec.SharedCacheMode mode)
+ {
+ if (mode == org.jboss.metadata.jpa.spec.SharedCacheMode.ALL)
+ return SharedCacheMode.ALL;
+ if (mode == org.jboss.metadata.jpa.spec.SharedCacheMode.DISABLE_SELECTIVE)
+ return SharedCacheMode.DISABLE_SELECTIVE;
+ if (mode == org.jboss.metadata.jpa.spec.SharedCacheMode.ENABLE_SELECTIVE)
+ return SharedCacheMode.ENABLE_SELECTIVE;
+ if (mode == org.jboss.metadata.jpa.spec.SharedCacheMode.NONE)
+ return SharedCacheMode.NONE;
+ if (mode == org.jboss.metadata.jpa.spec.SharedCacheMode.UNSPECIFIED)
+ return SharedCacheMode.UNSPECIFIED;
+ return null;
+ }
+
private ValidationMode convertToValidationMode(org.jboss.metadata.jpa.spec.ValidationMode validationMode)
{
// JBJPA-15 / JBAS-7417: if no validation mode is specified return null
@@ -170,25 +183,6 @@
}
}
- private Caching convertToCaching(SharedCacheMode sharedCacheMode)
- {
- // JBJPA-15: if no caching mode is specified return null
- if(sharedCacheMode == null) return null;
-
- switch (sharedCacheMode) {
- case ALL:
- return Caching.ALL;
- case DISABLE_SELECTIVE:
- return Caching.DISABLE_SELECTIVE;
- case ENABLE_SELECTIVE:
- return Caching.ENABLE_SELECTIVE;
- case NONE:
- return Caching.NONE;
- default:
- return null;
- }
- }
-
public void addTransformer(ClassTransformer transformer)
{
//throw new RuntimeException("NOT IMPLEMENTED");
@@ -352,14 +346,14 @@
this.validationMode = validationMode;
}
- public Caching getCaching()
+ public SharedCacheMode getSharedCacheMode()
{
- return caching;
+ return sharedCacheMode;
}
- public void setCaching(Caching caching)
+ public void setSharedCacheMode(SharedCacheMode sharedCacheMode)
{
- this.caching = caching;
+ this.sharedCacheMode = sharedCacheMode;
}
public String getPersistenceXMLSchemaVersion()
Modified: projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/tx/TransactionScopedEntityManager.java
===================================================================
--- projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/tx/TransactionScopedEntityManager.java 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/tx/TransactionScopedEntityManager.java 2009-11-04 21:28:18 UTC (rev 96015)
@@ -36,7 +36,6 @@
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.QueryBuilder;
import javax.persistence.metamodel.Metamodel;
import org.hibernate.Session;
@@ -352,16 +351,11 @@
return getEntityManager().getProperties();
}
- public QueryBuilder getQueryBuilder()
+ public javax.persistence.criteria.CriteriaBuilder getCriteriaBuilder()
{
- return getEntityManager().getQueryBuilder();
+ return getEntityManager().getCriteriaBuilder();
}
- public Set<String> getSupportedProperties()
- {
- return getEntityManager().getSupportedProperties();
- }
-
public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
{
verifyInTx();
Modified: projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java
===================================================================
--- projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java 2009-11-04 21:16:13 UTC (rev 96014)
+++ projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java 2009-11-04 21:28:18 UTC (rev 96015)
@@ -68,7 +68,7 @@
}
};
PersistenceUnitInfoImpl puii = new PersistenceUnitInfoImpl(metaData, props, classLoader, persistenceUnitRootUrl, jarFiles, ctx);
- assertNull(puii.getCaching());
+ assertNull(puii.getSharedCacheMode());
}
/**
More information about the jboss-cvs-commits
mailing list