From: nicus Date: Fri, 19 Apr 2013 13:27:21 +0000 (+0200) Subject: Fixed problem with NamingStrategy (contribution from Lorenzo Nicora) X-Git-Tag: hibernate4-maven-plugin-1.0.2~6 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=b6ac188a40136102edc51b6824875dfb07c89955;p=hibernate-maven-plugin Fixed problem with NamingStrategy (contribution from Lorenzo Nicora) * NamingStrategy is set explicitly on Hibernate Configuration (not passed by properties) * Added 'hibernateNamingStrategy' configuration property --- diff --git a/.gitignore b/.gitignore index eb5a316c..e47f2770 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ target +/.settings/ +/.classpath +/.project diff --git a/pom.xml b/pom.xml index e4308605..d12718e5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,10 @@ Adriano Machado adriano.m.machado@hotmail.com + + Lorenzo Nicora + lorenzo.nicora@nicus.it + diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 2ad0a299..36a5aca4 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -53,6 +53,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.NamingStrategy; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport.Type; import org.hibernate.tool.hbm2ddl.Target; @@ -77,6 +78,7 @@ public class Hbm2DdlMojo extends AbstractMojo public final static String USERNAME = "hibernate.connection.username"; public final static String PASSWORD = "hibernate.connection.password"; public final static String DIALECT = "hibernate.dialect"; + public final static String NAMING_STRATEGY="hibernate.ejb.naming_strategy"; private final static String MD5S = "schema.md5s"; @@ -197,6 +199,13 @@ public class Hbm2DdlMojo extends AbstractMojo */ private String hibernateDialect; + /** + * Hibernate Naming Strategy + * @parameter property="hibernate.ejb.naming_strategy" + * @author nicus + */ + private String hibernateNamingStrategy; + /** * Path to Hibernate configuration file. * @@ -468,7 +477,7 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + PASSWORD + "=" + properties.getProperty(PASSWORD) + - " with the value " + password + " with the value " + password ); else getLog().debug("Using the value " + password); @@ -486,6 +495,18 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug("Using the value " + hibernateDialect); properties.setProperty(DIALECT, hibernateDialect); } + if ( hibernateNamingStrategy != null ) + { + if ( properties.contains(NAMING_STRATEGY)) + getLog().debug( + "Overwriting property " + + NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) + + " with the value " + hibernateNamingStrategy + ); + else + getLog().debug("Using the value " + hibernateNamingStrategy); + properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy); + } /** The generated SQL varies with the dialect! */ if (md5s.containsKey(DIALECT)) @@ -514,6 +535,24 @@ public class Hbm2DdlMojo extends AbstractMojo Configuration config = new Configuration(); config.setProperties(properties); + + if ( properties.containsKey(NAMING_STRATEGY)) + { + String namingStrategy = properties.getProperty(NAMING_STRATEGY); + getLog().debug("Explicitly set NamingStrategy: " + namingStrategy); + try + { + @SuppressWarnings("unchecked") + Class namingStrategyClass = (Class) Class.forName(namingStrategy); + config.setNamingStrategy(namingStrategyClass.newInstance()); + } + catch (Exception e) + { + getLog().error("Error setting NamingStrategy", e); + throw new MojoExecutionException(e.getMessage()); + } + } + getLog().debug("Adding annotated classes to hibernate-mapping-configuration..."); for (Class annotatedClass : classes) {