[Springframework-cvs] spring/tiger/src/org/springframework/orm/jpa LocalEntityManagerFactoryBean.java,1.6,1.7 AbstractEntityManagerFactoryBean.java,1.1,1.2

[Rod J. <joh...@us...>]

Update of /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12689/tiger/src/org/springframework/orm/jpa

Modified Files:
	LocalEntityManagerFactoryBean.java 
	AbstractEntityManagerFactoryBean.java 
Log Message:
Pulled up PersistenceProvider class

Index: LocalEntityManagerFactoryBean.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LocalEntityManagerFactoryBean.java	21 Apr 2006 14:29:48 -0000	1.6
--- LocalEntityManagerFactoryBean.java	21 Apr 2006 16:59:37 -0000	1.7
***************
*** 55,60 ****
  public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
  
- 	private Class persistenceProviderClass;
- 
  	private String entityManagerName;
  
--- 55,58 ----
***************
*** 63,84 ****
  
  	/**
- 	/**
- 	 * Set the PersistenceProvider implementation class to use for creating
- 	 * the EntityManagerFactory. If not specified (which is the default),
- 	 * the <code>Persistence</code> class will be used to create the
- 	 * EntityManagerFactory, relying on JPA's autodetection mechanism.
- 	 * @see javax.persistence.spi.PersistenceProvider
- 	 * @see javax.persistence.Persistence
- 	 */
- 	public void setPersistenceProviderClass(Class persistenceProviderClass) {
- 		if (persistenceProviderClass != null &&
- 				!PersistenceProvider.class.isAssignableFrom(persistenceProviderClass)) {
- 			throw new IllegalArgumentException(
- 					"serviceFactoryClass must implement [javax.persistence.spi.PersistenceProvider]");
- 		}
- 		this.persistenceProviderClass = persistenceProviderClass;
- 	}
- 
- 	/**
  	 * Set the name of the EntityManager configuration for the factory.
  	 * <p>Default is none, indicating the default EntityManager configuration.
--- 61,64 ----

Index: AbstractEntityManagerFactoryBean.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractEntityManagerFactoryBean.java	21 Apr 2006 14:29:48 -0000	1.1
--- AbstractEntityManagerFactoryBean.java	21 Apr 2006 16:59:37 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  import javax.persistence.EntityManagerFactory;
  import javax.persistence.PersistenceException;
+ import javax.persistence.spi.PersistenceProvider;
  
  import org.apache.commons.logging.Log;
***************
*** 46,49 ****
--- 47,52 ----
  	private EntityManagerFactory entityManagerFactory;
  
+ 	protected Class persistenceProviderClass;
+ 
  	/**
  	 * Subclasses must implement this method to create the EntityManagerFactory that
***************
*** 86,88 ****
--- 89,109 ----
  	}
  
+ 	/**
+ 	/**
+ 	 * Set the PersistenceProvider implementation class to use for creating
+ 	 * the EntityManagerFactory. If not specified (which is the default),
+ 	 * the <code>Persistence</code> class will be used to create the
+ 	 * EntityManagerFactory, relying on JPA's autodetection mechanism.
+ 	 * @see javax.persistence.spi.PersistenceProvider
+ 	 * @see javax.persistence.Persistence
+ 	 */
+ 	public void setPersistenceProviderClass(Class persistenceProviderClass) {
+ 		if (persistenceProviderClass != null &&
+ 				!PersistenceProvider.class.isAssignableFrom(persistenceProviderClass)) {
+ 			throw new IllegalArgumentException(
+ 					"serviceFactoryClass must implement [javax.persistence.spi.PersistenceProvider]");
+ 		}
+ 		this.persistenceProviderClass = persistenceProviderClass;
+ 	}
+ 
  }