[jboss-cvs] jboss-seam/src/main/org/jboss/seam/persistence ...

[Gavin King]

  User: gavin   
  Date: 07/07/16 02:47:36

  Modified:    src/main/org/jboss/seam/persistence  
                        EntityManagerFactory.java
                        HibernateSessionFactory.java
  Log:
  JBSEAM-1647
  
  Revision  Changes    Path
  1.3       +17 -11    jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityManagerFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EntityManagerFactory.java	20 Jun 2007 17:45:57 -0000	1.2
  +++ EntityManagerFactory.java	16 Jul 2007 06:47:36 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: EntityManagerFactory.java,v 1.2 2007/06/20 17:45:57 gavin Exp $
  +//$Id: EntityManagerFactory.java,v 1.3 2007/07/16 06:47:36 gavin Exp $
   package org.jboss.seam.persistence;
   
   import java.util.HashMap;
  @@ -37,6 +37,7 @@
      @Unwrap
      public javax.persistence.EntityManagerFactory getEntityManagerFactory()
      {
  +//    TODO: eager/lazy modes
         return entityManagerFactory;
      }
      
  @@ -47,7 +48,21 @@
         {
            persistenceUnitName = component.getName();
         }
  +      //TODO: eager/lazy modes
  +      createEntityManagerFactory();
  +   }
  +
  +   @Destroy
  +   public void shutdown()
  +   {
  +      if (entityManagerFactory!=null)
  +      {
  +         entityManagerFactory.close();
  +      }
  +   }
         
  +   protected void createEntityManagerFactory()
  +   {
         Map properties = new HashMap();
         Hashtable<String, String> jndiProperties = Naming.getInitialContextProperties();
         if ( jndiProperties!=null )
  @@ -73,15 +88,6 @@
         }
      }
      
  -   @Destroy
  -   public void shutdown()
  -   {
  -      if (entityManagerFactory!=null)
  -      {
  -         entityManagerFactory.close();
  -      }
  -   }
  -   
      /**
       * The persistence unit name
       */
  
  
  
  1.3       +30 -14    jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateSessionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- HibernateSessionFactory.java	20 Jun 2007 17:45:57 -0000	1.2
  +++ HibernateSessionFactory.java	16 Jul 2007 06:47:36 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: HibernateSessionFactory.java,v 1.2 2007/06/20 17:45:57 gavin Exp $
  +//$Id: HibernateSessionFactory.java,v 1.3 2007/07/16 06:47:36 gavin Exp $
   package org.jboss.seam.persistence;
   
   import java.io.File;
  @@ -70,7 +70,24 @@
      @Unwrap
      public SessionFactory getSessionFactory() throws Exception
      {
  -      return createSessionFactory();
  +      //TODO: eager/lazy modes
  +      return sessionFactory;
  +   }
  +   
  +   @Create
  +   public void startup() throws Exception
  +   {
  +      //TODO: eager/lazy modes
  +      sessionFactory = createSessionFactory();
  +   }
  +   
  +   @Destroy
  +   public void shutdown()
  +   {
  +      if (sessionFactory!=null)
  +      {
  +         sessionFactory.close();
  +      }
      }
      
      protected SessionFactory createSessionFactory() throws ClassNotFoundException
  @@ -150,18 +167,6 @@
         return configuration.buildSessionFactory();
      }
      
  -   @Create
  -   public void startup() throws Exception
  -   {
  -      sessionFactory = createSessionFactory();
  -   }
  -   
  -   @Destroy
  -   public void shutdown()
  -   {
  -      sessionFactory.close();
  -   }
  -
      public String getCfgResourceName()
      {
         return cfgResourceName;
  @@ -186,46 +191,57 @@
      {
         return cfgProperties;
      }
  +   
      public void setCfgProperties(Map<String, String> cfgProperties)
      {
         this.cfgProperties = cfgProperties;
      }
  +   
      public List<String> getMappingClasses()
      {
         return mappingClasses;
      }
  +   
      public void setMappingClasses(List<String> mappingClasses)
      {
         this.mappingClasses = mappingClasses;
      }
  +   
      public List<String> getMappingFiles()
      {
         return mappingFiles;
      }
  +   
      public void setMappingFiles(List<String> mappingFiles)
      {
         this.mappingFiles = mappingFiles;
      }
  +   
      public List<String> getMappingJars()
      {
         return mappingJars;
      }
  +   
      public void setMappingJars(List<String> mappingJars)
      {
         this.mappingJars = mappingJars;
      }
  +   
      public List<String> getMappingPackages()
      {
         return mappingPackages;
      }
  +   
      public void setMappingPackages(List<String> mappingPackages)
      {
         this.mappingPackages = mappingPackages;
      }
  +   
      public List<String> getMappingResources()
      {
         return mappingResources;
      }
  +   
      public void setMappingResources(List<String> mappingResources)
      {
         this.mappingResources = mappingResources;