X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=f1b6a2cdb64a0dca74297b09430aacc7819af662;hb=2a85cb05542795f9cd2eed448f212f92842a85e8;hp=73f0ab0639eef2ecfc58fba1e4dee39018232013;hpb=426d18e689b89f33bf71601becfa465a00067b10;p=hibernate4-maven-plugin diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 73f0ab06..f1b6a2cd 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -30,16 +30,16 @@ import java.net.URL; import java.net.URLClassLoader; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.sql.Connection; import java.sql.Driver; -import java.sql.DriverManager; import java.sql.DriverPropertyInfo; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; +import java.util.Collections; import java.util.Comparator; -import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -52,14 +52,25 @@ import java.util.regex.Pattern; import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +import javax.persistence.spi.PersistenceUnitTransactionType; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; +import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; +import org.hibernate.cfg.Environment; import org.hibernate.cfg.NamingStrategy; import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.internal.util.config.ConfigurationHelper; +import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; +import org.hibernate.jpa.boot.internal.PersistenceXmlParser; +import org.hibernate.jpa.boot.spi.ProviderChecker; +import org.hibernate.mapping.PersistentClass; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport.Type; import org.hibernate.tool.hbm2ddl.Target; @@ -143,6 +154,9 @@ public class Hbm2DdlMojo extends AbstractMojo * scanned for annotated classes. Multiple scopes can be seperated by * white space or commas. *
+ * If you do not want any dependencies to be scanned for annotated
+ * classes, set this parameter to none
.
+ *
* The plugin does not scan for annotated classes in transitive
* dependencies. If some of your annotated classes are hidden in a
* transitive dependency, you can simply add that dependency explicitly.
@@ -244,13 +258,33 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateNamingStrategy;
/**
- * Path to Hibernate configuration file.
+ * Path to Hibernate properties file.
*
* @parameter default-value="${project.build.outputDirectory}/hibernate.properties"
* @since 1.0
*/
private String hibernateProperties;
+ /**
+ * Path to Hibernate configuration file (.cfg.xml).
+ * Settings in this file will overwrite settings in the properties file.
+ *
+ * @parameter default-value="${project.build.outputDirectory}/hibernate.cfg.xml"
+ * @since 1.1.0
+ */
+ private String hibernateConfig;
+
+ /**
+ * Name of the persistence-unit.
+ * If there is only one persistence-unit available, that unit will be used
+ * automatically.
+ * Settings in this file will overwrite settings in the properties or the
+ * configuration file.
+ *
+ * @since 1.1.0
+ */
+ private String persistenceUnit;
+
/**
* List of Hibernate-Mapping-Files (XML).
* Multiple files can be separated with white-spaces and/or commas.
@@ -320,7 +354,7 @@ public class Hbm2DdlMojo extends AbstractMojo
/**
* Generate envers schema for auditing tables.
*
- * @parameter property="hibernate.export.envers" default-value="false"
+ * @parameter property="hibernate.export.envers" default-value="true"
* @since 1.0.3
*/
private boolean envers;
@@ -502,222 +536,211 @@ public class Hbm2DdlMojo extends AbstractMojo
throw new MojoFailureException(e.getMessage());
}
- if (classes.isEmpty())
- {
- if (hibernateMapping == null || hibernateMapping.isEmpty())
- throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
- }
- else
- {
- getLog().debug("Detected classes with mapping-annotations:");
- for (Class> annotatedClass : classes)
- getLog().debug(" " + annotatedClass.getName());
- }
+ ValidationConfiguration config = new ValidationConfiguration();
+ // Clear unused system-properties
+ config.setProperties(new Properties());
- Properties properties = new Properties();
- /** Try to read configuration from properties-file */
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ StandardServiceRegistryImpl registry = null;
+ MavenLogAppender.startPluginLog(this);
+
try
{
- File file = new File(hibernateProperties);
- if (file.exists())
+ /** Try to read configuration from properties-file */
+ try
{
- getLog().info("Reading properties from file " + hibernateProperties + "...");
- properties.load(new FileInputStream(file));
+ File file = new File(hibernateProperties);
+ if (file.exists())
+ {
+ getLog().info("Reading properties from file " + hibernateProperties + "...");
+ Properties properties = new Properties();
+ properties.load(new FileInputStream(file));
+ config.setProperties(properties);
+ }
+ else
+ getLog().info("No hibernate-properties-file found! (Checked path: " + hibernateProperties + ")");
+ }
+ catch (IOException e)
+ {
+ getLog().error("Error while reading properties!", e);
+ throw new MojoExecutionException(e.getMessage());
}
- else
- getLog().info("No hibernate-properties-file found! (Checked path: " + hibernateProperties + ")");
- }
- catch (IOException e)
- {
- getLog().error("Error while reading properties!", e);
- throw new MojoExecutionException(e.getMessage());
- }
- /** Overwrite values from properties-file or set, if given */
- if (driverClassName != null)
- {
- if (properties.containsKey(DRIVER_CLASS))
- getLog().debug(
- "Overwriting property " +
- DRIVER_CLASS + "=" + properties.getProperty(DRIVER_CLASS) +
- " with the value " + driverClassName
- );
- else
- getLog().debug("Using the value " + driverClassName);
- properties.setProperty(DRIVER_CLASS, driverClassName);
- }
- if (url != null)
- {
- if (properties.containsKey(URL))
- getLog().debug(
- "Overwriting property " +
- URL + "=" + properties.getProperty(URL) +
- " with the value " + url
- );
- else
- getLog().debug("Using the value " + url);
- properties.setProperty(URL, url);
- }
- if (username != null)
- {
- if (properties.containsKey(USERNAME))
- getLog().debug(
- "Overwriting property " +
- USERNAME + "=" + properties.getProperty(USERNAME) +
- " with the value " + username
- );
- else
- getLog().debug("Using the value " + username);
- properties.setProperty(USERNAME, username);
- }
- if (password != null)
- {
- if (properties.containsKey(PASSWORD))
- getLog().debug(
- "Overwriting property " +
- PASSWORD + "=" + properties.getProperty(PASSWORD) +
- " with value " + password
- );
- else
- getLog().debug("Using value " + password + " for property " + PASSWORD);
- properties.setProperty(PASSWORD, password);
- }
- if (hibernateDialect != null)
- {
- if (properties.containsKey(DIALECT))
- getLog().debug(
- "Overwriting property " +
- DIALECT + "=" + properties.getProperty(DIALECT) +
- " with value " + hibernateDialect
- );
- else
- getLog().debug(
- "Using value " + hibernateDialect + " for property " + DIALECT
- );
- properties.setProperty(DIALECT, hibernateDialect);
- }
- if ( hibernateNamingStrategy != null )
- {
- if ( properties.contains(NAMING_STRATEGY))
- getLog().debug(
- "Overwriting property " +
- NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +
- " with value " + hibernateNamingStrategy
- );
- else
- getLog().debug(
- "Using value " + hibernateNamingStrategy + " for property " +
- NAMING_STRATEGY
- );
- properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
- }
+ /**
+ * Change class-loader of current thread, so that hibernate can
+ * see all dependencies!
+ */
+ Thread.currentThread().setContextClassLoader(classLoader);
- /** The generated SQL varies with the dialect! */
- if (md5s.containsKey(DIALECT))
- {
- String dialect = properties.getProperty(DIALECT);
- if (md5s.get(DIALECT).equals(dialect))
- getLog().debug("SQL-dialect unchanged.");
- else
+ /** Try to read configuration from configuration-file */
+ try
{
- modified = true;
- if (dialect == null)
+ File file = new File(hibernateConfig);
+ if (file.exists())
{
- getLog().debug("SQL-dialect was unset.");
- md5s.remove(DIALECT);
+ getLog().info("Reading configuration from file " + hibernateConfig + "...");
+ config.configure(file);
}
else
- {
- getLog().debug("SQL-dialect changed: " + dialect);
- md5s.put(DIALECT, dialect);
- }
+ getLog().info("No hibernate-configuration-file found! (Checked path: " + hibernateConfig + ")");
}
- }
- else
- {
- String dialect = properties.getProperty(DIALECT);
- if (dialect != null)
+ catch (Exception e)
{
- modified = true;
- md5s.put(DIALECT, properties.getProperty(DIALECT));
+ getLog().error("Error while reading configuration!", e);
+ throw new MojoExecutionException(e.getMessage());
}
- }
- /** The generated SQL varies with the envers-configuration */
- if (md5s.get(ENVERS) != null)
- {
- if (md5s.get(ENVERS).equals(Boolean.toString(envers)))
- getLog().debug("Envers-Configuration unchanged. Enabled: " + envers);
- else
+ ParsedPersistenceXmlDescriptor persistenceUnitDescriptor =
+ getPersistenceUnitDescriptor(
+ persistenceUnit,
+ config.getProperties(),
+ new MavenProjectClassLoaderService(classLoader)
+ );
+ if (persistenceUnitDescriptor != null)
+ config.setProperties(persistenceUnitDescriptor.getProperties());
+
+ /** Overwrite values from properties-file or set, if given */
+ if (driverClassName != null)
{
- getLog().debug("Envers-Configuration changed. Enabled: " + envers);
- modified = true;
- md5s.put(ENVERS, Boolean.toString(envers));
+ if (config.getProperties().containsKey(DRIVER_CLASS))
+ getLog().debug(
+ "Overwriting property " +
+ DRIVER_CLASS + "=" + config.getProperty(DRIVER_CLASS) +
+ " with the value " + driverClassName
+ );
+ else
+ getLog().debug("Using the value " + driverClassName);
+ config.setProperty(DRIVER_CLASS, driverClassName);
}
- }
- else
- {
- modified = true;
- md5s.put(ENVERS, Boolean.toString(envers));
- }
-
- if (properties.isEmpty())
- {
- getLog().error("No properties set!");
- throw new MojoFailureException("Hibernate configuration is missing!");
- }
-
- final ValidationConfiguration config = new ValidationConfiguration(hibernateDialect);
-
- config.setProperties(properties);
-
- if ( properties.containsKey(NAMING_STRATEGY))
- {
- String namingStrategy = properties.getProperty(NAMING_STRATEGY);
- getLog().debug("Explicitly set NamingStrategy: " + namingStrategy);
- try
+ if (url != null)
{
- @SuppressWarnings("unchecked")
- Class