[jboss-cvs] JBossAS SVN: r94348 - in projects/ejb3/branches/jboss-ejb3-jpa-int-1.x: src/main/java/org/jboss/ejb3/jpa/integration and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Oct 5 06:04:41 EDT 2009


Author: wolfc
Date: 2009-10-05 06:04:41 -0400 (Mon, 05 Oct 2009)
New Revision: 94348

Removed:
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/Hibernate3_5SessionFactoryDelegator.java
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/test/java/hack/
Modified:
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/pom.xml
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractEntityManagerDelegator.java
   projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractSessionFactoryDelegator.java
Log:
EJBTHREE-1931: removed JPA2 stuff from 1.x


Modified: projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/pom.xml
===================================================================
--- projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/pom.xml	2009-10-05 09:58:34 UTC (rev 94347)
+++ projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/pom.xml	2009-10-05 10:04:41 UTC (rev 94348)
@@ -14,7 +14,7 @@
   <!-- Artifact Configuration -->
   <groupId>org.jboss.ejb3</groupId>
   <artifactId>jboss-ejb3-jpa-int</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <name>JBoss EJB 3.x JPA Integration</name>
   <description>JBoss EJB 3.x JPA Integration</description>
   <url>http://www.jboss.org/jbossejb3</url>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>3.5.0.Beta-1</version>
+      <version>3.3.1.GA</version>
       <scope>provided</scope>
     </dependency>
     
     <dependency>
-      <groupId>org.hibernate.java-persistence</groupId>
-      <artifactId>jpa-api</artifactId>
-      <version>2.0.Beta-20090815</version>
+      <groupId>org.hibernate</groupId>
+      <artifactId>ejb3-persistence</artifactId>
+      <version>1.0.2.GA</version>
       <scope>provided</scope>
     </dependency>
 

Modified: projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractEntityManagerDelegator.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractEntityManagerDelegator.java	2009-10-05 09:58:34 UTC (rev 94347)
+++ projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractEntityManagerDelegator.java	2009-10-05 10:04:41 UTC (rev 94348)
@@ -29,7 +29,7 @@
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public abstract class AbstractEntityManagerDelegator extends JPA2EntityManagerDelegator implements EntityManager
+public abstract class AbstractEntityManagerDelegator extends JPA1EntityManagerDelegator implements EntityManager
 {
    private static final long serialVersionUID = 1L;
 }

Modified: projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractSessionFactoryDelegator.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractSessionFactoryDelegator.java	2009-10-05 09:58:34 UTC (rev 94347)
+++ projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/AbstractSessionFactoryDelegator.java	2009-10-05 10:04:41 UTC (rev 94348)
@@ -27,7 +27,7 @@
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public abstract class AbstractSessionFactoryDelegator extends Hibernate3_5SessionFactoryDelegator implements SessionFactory
+public abstract class AbstractSessionFactoryDelegator extends Hibernate3_3SessionFactoryDelegator implements SessionFactory
 {
    private static final long serialVersionUID = 1L;
 }

Deleted: projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/Hibernate3_5SessionFactoryDelegator.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/Hibernate3_5SessionFactoryDelegator.java	2009-10-05 09:58:34 UTC (rev 94347)
+++ projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/Hibernate3_5SessionFactoryDelegator.java	2009-10-05 10:04:41 UTC (rev 94348)
@@ -1,43 +0,0 @@
-/*
- * 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.ejb3.jpa.integration;
-
-import org.hibernate.Cache;
-
-/**
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class Hibernate3_5SessionFactoryDelegator extends Hibernate3_3SessionFactoryDelegator
-{
-   private static final long serialVersionUID = 1L;
-
-   public boolean containsFetchProfileDefition(String profile)
-   {
-      return getSessionFactory().containsFetchProfileDefition(profile);
-   }
-
-   public Cache getCache()
-   {
-      return getSessionFactory().getCache();
-   }
-}

Deleted: projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java	2009-10-05 09:58:34 UTC (rev 94347)
+++ projects/ejb3/branches/jboss-ejb3-jpa-int-1.x/src/main/java/org/jboss/ejb3/jpa/integration/JPA2EntityManagerDelegator.java	2009-10-05 10:04:41 UTC (rev 94348)
@@ -1,138 +0,0 @@
-/*
- * 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.ejb3.jpa.integration;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.LockModeType;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.QueryBuilder;
-import javax.persistence.metamodel.Metamodel;
-
-/**
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class JPA2EntityManagerDelegator extends JPA1EntityManagerDelegator implements EntityManager
-{
-   private static final long serialVersionUID = 1L;
-   
-   public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass)
-   {
-      return getEntityManager().createNamedQuery(name, resultClass);
-   }
-
-   public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery)
-   {
-      return getEntityManager().createQuery(criteriaQuery);
-   }
-
-   public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass)
-   {
-      return getEntityManager().createQuery(qlString, resultClass);
-   }
-
-   public void detach(Object entity)
-   {
-      getEntityManager().detach(entity);
-   }
-
-   public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties)
-   {
-      return getEntityManager().find(entityClass, primaryKey, properties);
-   }
-
-   public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode)
-   {
-      return getEntityManager().find(entityClass, primaryKey, lockMode);
-   }
-
-   public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties)
-   {
-      return getEntityManager().find(entityClass, primaryKey, lockMode, properties);
-   }
-
-   public EntityManagerFactory getEntityManagerFactory()
-   {
-      return getEntityManager().getEntityManagerFactory();
-   }
-
-   public LockModeType getLockMode(Object entity)
-   {
-      return getEntityManager().getLockMode(entity);
-   }
-
-   public Metamodel getMetamodel()
-   {
-      return getEntityManager().getMetamodel();
-   }
-
-   public Map<String, Object> getProperties()
-   {
-      return getEntityManager().getProperties();
-   }
-
-   public QueryBuilder getQueryBuilder()
-   {
-      return getEntityManager().getQueryBuilder();
-   }
-
-   public Set<String> getSupportedProperties()
-   {
-      return getEntityManager().getSupportedProperties();
-   }
-
-   public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties)
-   {
-      getEntityManager().lock(entity, lockMode, properties);
-   }
-
-   public void refresh(Object entity, Map<String, Object> properties)
-   {
-      getEntityManager().refresh(entity, properties);
-   }
-
-   public void refresh(Object entity, LockModeType lockMode)
-   {
-      getEntityManager().refresh(entity, lockMode);
-   }
-
-   public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties)
-   {
-      getEntityManager().refresh(entity, lockMode, properties);
-   }
-
-   public void setProperty(String propertyName, Object value)
-   {
-      getEntityManager().setProperty(propertyName, value);
-   }
-
-   public <T> T unwrap(Class<T> cls)
-   {
-      return getEntityManager().unwrap(cls);
-   }
-
-}




More information about the jboss-cvs-commits mailing list