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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/05/27 20:52:11

  Modified:    src/main/org/jboss/seam/microcontainer 
                        HibernateFactory.java
  Log:
  JBSEAM-1357
  
  Revision  Changes    Path
  1.15      +27 -1     jboss-seam/src/main/org/jboss/seam/microcontainer/HibernateFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/microcontainer/HibernateFactory.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- HibernateFactory.java	13 Feb 2007 15:13:12 -0000	1.14
  +++ HibernateFactory.java	28 May 2007 00:52:11 -0000	1.15
  @@ -1,13 +1,16 @@
  -//$Id: HibernateFactory.java,v 1.14 2007/02/13 15:13:12 sbryzak2 Exp $
  +//$Id: HibernateFactory.java,v 1.15 2007/05/28 00:52:11 sbryzak2 Exp $
   package org.jboss.seam.microcontainer;
  +
   import java.io.File;
   import java.util.Hashtable;
   import java.util.List;
   import java.util.Map;
   import java.util.Properties;
  +
   import org.hibernate.SessionFactory;
   import org.hibernate.cfg.AnnotationConfiguration;
   import org.hibernate.cfg.Environment;
  +import org.hibernate.cfg.NamingStrategy;
   import org.hibernate.util.ReflectHelper;
   import org.jboss.seam.security.HibernateSecurityInterceptor;
   import org.jboss.seam.util.Naming;
  @@ -48,13 +51,23 @@
      private List<String> mappingJars;
      private List<String> mappingPackages;
      private List<String> mappingResources;
  +   private NamingStrategy namingStrategy;
  +   
      public SessionFactory getSessionFactory() throws Exception
      {
         return createSessionFactory();
      }
  +   
      protected SessionFactory createSessionFactory() throws ClassNotFoundException
      {
         AnnotationConfiguration configuration = new AnnotationConfiguration();
  +      
  +      // setup non-default naming strategy
  +      if (namingStrategy != null)
  +      {
  +         configuration.setNamingStrategy(namingStrategy);
  +      }
  +      
         // Programmatic configuration
         if (cfgProperties != null)
         {
  @@ -118,16 +131,29 @@
         }
         
         configuration.setInterceptor(new HibernateSecurityInterceptor(configuration.getInterceptor()));
  +      
         return configuration.buildSessionFactory();
      }
      public String getCfgResourceName()
      {
         return cfgResourceName;
      }
  +   
      public void setCfgResourceName(String cfgFileName)
      {
         this.cfgResourceName = cfgFileName;
      }
  +   
  +   public NamingStrategy getNamingStrategy()
  +   {
  +      return namingStrategy;
  +   }
  +   
  +   public void setNamingStrategy(NamingStrategy namingStrategy)
  +   {
  +      this.namingStrategy = namingStrategy;
  +   }
  +   
      public Map<String, String> getCfgProperties()
      {
         return cfgProperties;