[jboss-cvs] jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console ...

[Max Rydahl Andersen]

  User: mandersen
  Date: 06/12/14 06:52:52

  Modified:    hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console 
                        ConsoleConfiguration.java
  Log:
  HBX-839: Support persistence unit name in eclipse 
  HBX-840: Support namingstrategy in eclipse 
  
  Revision  Changes    Path
  1.15      +17 -1     jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConsoleConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ConsoleConfiguration.java	11 Dec 2006 22:21:59 -0000	1.14
  +++ ConsoleConfiguration.java	14 Dec 2006 11:52:52 -0000	1.15
  @@ -48,6 +48,7 @@
   import org.hibernate.SessionFactory;
   import org.hibernate.cfg.Configuration;
   import org.hibernate.cfg.Environment;
  +import org.hibernate.cfg.NamingStrategy;
   import org.hibernate.cfg.Settings;
   import org.hibernate.console.execution.DefaultExecutionContext;
   import org.hibernate.console.execution.ExecutionContext;
  @@ -108,11 +109,17 @@
   	}
   
   	private Configuration buildJPAConfiguration(String persistenceUnit, Properties properties, String entityResolver) {
  +		if(StringHelper.isEmpty( persistenceUnit )) {
  +			persistenceUnit = null;
  +		}
   		try {
   			Map overrides = new HashMap();
   			if(properties!=null) {
   				overrides.putAll( properties );
   			}
  +			if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) {
  +				overrides.put( "hibernate.ejb.naming_strategy", prefs.getNamingStrategy() );
  +			}
   			
   			Class clazz = ReflectHelper.classForName("org.hibernate.ejb.Ejb3Configuration", JPAConfigurationTask.class);
   			Object ejb3cfg = clazz.newInstance();
  @@ -447,7 +454,7 @@
   			}
   		} else if(prefs.getConfigurationMode().equals( ConfigurationMode.JPA )) {
   			try {
  -				localCfg = buildJPAConfiguration( null, properties, prefs.getEntityResolverName() );
  +				localCfg = buildJPAConfiguration( getPreferences().getPersistenceUnitName(), properties, prefs.getEntityResolverName() );
   			}
   			catch (Exception e) {
   				throw new HibernateConsoleRuntimeException("Could not load JPA Configuration",e);
  @@ -473,6 +480,15 @@
   		}
   		localCfg.setEntityResolver(entityResolver);
   
  +		if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) {			
  +			try {
  +				NamingStrategy ns = (NamingStrategy) ReflectHelper.classForName(prefs.getNamingStrategy()).newInstance();
  +				localCfg.setNamingStrategy( ns );
  +			} catch (Exception c) {
  +				throw new HibernateConsoleRuntimeException("Could not configure naming strategy " + prefs.getNamingStrategy(), c);
  +			}
  +		}
  +		
   		localCfg = loadConfigurationXML( localCfg, includeMappings, entityResolver );
   		
   		return localCfg;