X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=c2ba9dac7ababd8b3875a4528bbc186b05a3cce6;hb=refs%2Fheads%2F1.1.0;hp=85ae5182d1187a1d0223df9b07ef532718a2ba00;hpb=473c3ef285c19e0f0b85643b67bbd77e06c0b926;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 85ae5182..c2ba9dac 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.LinkedHashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -52,14 +52,24 @@ 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.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
import org.hibernate.tool.hbm2ddl.Target;
@@ -87,6 +97,11 @@ public class Hbm2DdlMojo extends AbstractMojo
public final static String NAMING_STRATEGY="hibernate.ejb.naming_strategy";
public final static String ENVERS = "hibernate.export.envers";
+ public final static String JPA_DRIVER = "javax.persistence.jdbc.driver";
+ public final static String JPA_URL = "javax.persistence.jdbc.url";
+ public final static String JPA_USERNAME = "javax.persistence.jdbc.user";
+ public final static String JPA_PASSWORD = "javax.persistence.jdbc.password";
+
public final static String MD5S = "hibernate4-generatedschema.md5s";
private final static Pattern split = Pattern.compile("[^,\\s]+");
@@ -247,13 +262,40 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateNamingStrategy;
/**
- * Path to Hibernate configuration file.
+ * Path to Hibernate properties file.
+ * If this parameter is not set the plugin will try to load the configuration
+ * from a file hibernate.properties
on the classpath. The
+ * test-classpath takes precedence.
*
- * @parameter default-value="${project.build.outputDirectory}/hibernate.properties"
+ * @parameter
* @since 1.0
*/
private String hibernateProperties;
+ /**
+ * Path to Hibernate configuration file (.cfg.xml).
+ * Settings in this file will overwrite settings in the properties file.
+ * If this parameter is not set the plugin will try to load the configuration
+ * from a file hibernate.cfg.xml
on the classpath. The
+ * test-classpath takes precedence.
+ *
+ * @parameter
+ * @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.
+ *
+ * @parameter
+ * @since 1.1.0
+ */
+ private String persistenceUnit;
+
/**
* List of Hibernate-Mapping-Files (XML).
* Multiple files can be separated with white-spaces and/or commas.
@@ -323,7 +365,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;
@@ -374,20 +416,39 @@ public class Hbm2DdlMojo extends AbstractMojo
}
}
- ClassLoader classLoader = null;
+ URLClassLoader classLoader = null;
try
{
getLog().debug("Creating ClassLoader for project-dependencies...");
List classpathFiles = project.getCompileClasspathElements();
if (scanTestClasses)
classpathFiles.addAll(project.getTestClasspathElements());
- URL[] urls = new URL[classpathFiles.size()];
- for (int i = 0; i < classpathFiles.size(); ++i)
+ List urls = new LinkedList();
+ File file;
+ file = new File(testOutputDirectory);
+ if (!file.exists())
+ {
+ getLog().info("creating test-output-directory: " + testOutputDirectory);
+ file.mkdirs();
+ }
+ urls.add(file.toURI().toURL());
+ file = new File(outputDirectory);
+ if (!file.exists())
+ {
+ getLog().info("creating output-directory: " + outputDirectory);
+ file.mkdirs();
+ }
+ urls.add(file.toURI().toURL());
+ for (String pathElement : classpathFiles)
{
- getLog().debug("Dependency: " + classpathFiles.get(i));
- urls[i] = new File(classpathFiles.get(i)).toURI().toURL();
+ getLog().debug("Dependency: " + pathElement);
+ urls.add(new File(pathElement).toURI().toURL());
}
- classLoader = new URLClassLoader(urls, getClass().getClassLoader());
+ classLoader =
+ new URLClassLoader(
+ urls.toArray(new URL[urls.size()]),
+ getClass().getClassLoader()
+ );
}
catch (Exception e)
{
@@ -505,226 +566,309 @@ 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())
+ /**
+ * Change class-loader of current thread, so that hibernate can
+ * see all dependencies!
+ */
+ Thread.currentThread().setContextClassLoader(classLoader);
+
+
+ /** Try to read configuration from properties-file */
+ try
{
- getLog().info("Reading properties from file " + hibernateProperties + "...");
- properties.load(new FileInputStream(file));
+ if (hibernateProperties == null)
+ {
+ URL url = classLoader.findResource("hibernate.properties");
+ if (url == null)
+ {
+ getLog().info("No hibernate.properties on the classpath!");
+ }
+ else
+ {
+ getLog().info("Reading settings from hibernate.properties on the classpath.");
+ Properties properties = new Properties();
+ properties.load(url.openStream());
+ config.setProperties(properties);
+ }
+ }
+ else
+ {
+ File file = new File(hibernateProperties);
+ if (file.exists())
+ {
+ getLog().info("Reading settings 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);
- }
- else
- {
- hibernateDialect = properties.getProperty(DIALECT);
- }
- 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);
- }
- /** 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)
+ if (hibernateConfig == null)
{
- getLog().debug("SQL-dialect was unset.");
- md5s.remove(DIALECT);
+ URL url = classLoader.findResource("hibernate.cfg.xml");
+ if (url == null)
+ {
+ getLog().info("No hibernate.cfg.xml on the classpath!");
+ }
+ else
+ {
+ getLog().info("Reading settings from hibernate.cfg.xml on the classpath.");
+ config.configure(url);
+ }
}
else
{
- getLog().debug("SQL-dialect changed: " + dialect);
- md5s.put(DIALECT, dialect);
+ File file = new File(hibernateConfig);
+ if (file.exists())
+ {
+ getLog().info("Reading configuration from file " + hibernateConfig + "...");
+ config.configure(file);
+ }
+ else
+ 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);
+ }
+ if (config.getProperty(DRIVER_CLASS) == null)
+ {
+ String driver = config.getProperty(JPA_DRIVER);
+ if (driver != null)
+ {
+ getLog().info(
+ DRIVER_CLASS +
+ " is not set. Borrow setting from " +
+ JPA_DRIVER +
+ ": " +
+ driver);
+ config.setProperty(DRIVER_CLASS, driver);
+ }
}
- }
- else
- {
- modified = true;
- md5s.put(ENVERS, Boolean.toString(envers));
- }
- if (properties.isEmpty())
- {
- getLog().error("No properties set!");
- throw new MojoFailureException("Hibernate configuration is missing!");
- }
+ if (url != null)
+ {
+ if (config.getProperties().containsKey(URL))
+ getLog().debug(
+ "Overwriting property " +
+ URL + "=" + config.getProperty(URL) +
+ " with the value " + url
+ );
+ else
+ getLog().debug("Using the value " + url);
+ config.setProperty(URL, url);
+ }
+ if (config.getProperty(URL) == null)
+ {
+ String url = config.getProperty(JPA_URL);
+ if (url != null)
+ {
+ getLog().info(
+ URL +
+ " is not set. Borrow setting from " +
+ JPA_URL +
+ ": " +
+ url);
+ config.setProperty(URL, url);
+ }
+ }
- final ValidationConfiguration config = new ValidationConfiguration(hibernateDialect);
+ if (username != null)
+ {
+ if (config.getProperties().containsKey(USERNAME))
+ getLog().debug(
+ "Overwriting property " +
+ USERNAME + "=" + config.getProperty(USERNAME) +
+ " with the value " + username
+ );
+ else
+ getLog().debug("Using the value " + username);
+ config.setProperty(USERNAME, username);
+ }
+ if (config.getProperty(USERNAME) == null)
+ {
+ String username = config.getProperty(JPA_USERNAME);
+ if (username != null)
+ {
+ getLog().info(
+ USERNAME +
+ " is not set. Borrow setting from " +
+ JPA_USERNAME +
+ ": " +
+ username);
+ config.setProperty(USERNAME, username);
+ }
+ }
- config.setProperties(properties);
+ if (password != null)
+ {
+ if (config.getProperties().containsKey(PASSWORD))
+ getLog().debug(
+ "Overwriting property " +
+ PASSWORD + "=" + config.getProperty(PASSWORD) +
+ " with value " + password
+ );
+ else
+ getLog().debug("Using value " + password + " for property " + PASSWORD);
+ config.setProperty(PASSWORD, password);
+ }
+ if (config.getProperty(PASSWORD) == null)
+ {
+ String password = config.getProperty(JPA_PASSWORD);
+ if (password != null)
+ {
+ getLog().info(
+ PASSWORD +
+ " is not set. Borrow setting from " +
+ JPA_PASSWORD +
+ ": " +
+ password);
+ config.setProperty(PASSWORD, password);
+ }
+ }
- if ( properties.containsKey(NAMING_STRATEGY))
- {
- String namingStrategy = properties.getProperty(NAMING_STRATEGY);
- getLog().debug("Explicitly set NamingStrategy: " + namingStrategy);
- try
+ if (hibernateDialect != null)
{
- @SuppressWarnings("unchecked")
- Class namingStrategyClass = (Class) Class.forName(namingStrategy);
- config.setNamingStrategy(namingStrategyClass.newInstance());
+ if (config.getProperties().containsKey(DIALECT))
+ getLog().debug(
+ "Overwriting property " +
+ DIALECT + "=" + config.getProperty(DIALECT) +
+ " with value " + hibernateDialect
+ );
+ else
+ getLog().debug(
+ "Using value " + hibernateDialect + " for property " + DIALECT
+ );
+ config.setProperty(DIALECT, hibernateDialect);
}
- catch (Exception e)
+
+ if ( hibernateNamingStrategy != null )
{
- getLog().error("Error setting NamingStrategy", e);
- throw new MojoExecutionException(e.getMessage());
+ if ( config.getProperties().contains(NAMING_STRATEGY))
+ getLog().debug(
+ "Overwriting property " +
+ NAMING_STRATEGY + "=" + config.getProperty(NAMING_STRATEGY) +
+ " with value " + hibernateNamingStrategy
+ );
+ else
+ getLog().debug(
+ "Using value " + hibernateNamingStrategy + " for property " +
+ NAMING_STRATEGY
+ );
+ config.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
}
- }
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- Connection connection = null;
- MavenLogAppender.startPluginLog(this);
- try
- {
- /**
- * 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 = config.getProperty(DIALECT);
+ if (md5s.get(DIALECT).equals(dialect))
+ getLog().debug("SQL-dialect unchanged.");
+ else
+ {
+ modified = true;
+ if (dialect == null)
+ {
+ getLog().debug("SQL-dialect was unset.");
+ md5s.remove(DIALECT);
+ }
+ else
+ {
+ getLog().debug("SQL-dialect changed: " + dialect);
+ md5s.put(DIALECT, dialect);
+ }
+ }
+ }
+ else
+ {
+ String dialect = config.getProperty(DIALECT);
+ if (dialect != null)
+ {
+ modified = true;
+ md5s.put(DIALECT, config.getProperty(DIALECT));
+ }
+ }
- getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
- // build annotated packages
- Set packages = new HashSet();
- for (Class> annotatedClass : classes)
+ /** The generated SQL varies with the envers-configuration */
+ if (md5s.get(ENVERS) != null)
{
- String packageName = annotatedClass.getPackage().getName();
- if (!packages.contains(packageName))
+ if (md5s.get(ENVERS).equals(Boolean.toString(envers)))
+ getLog().debug("Envers-Configuration unchanged. Enabled: " + envers);
+ else
{
- getLog().debug("Add package " + packageName);
- packages.add(packageName);
- config.addPackage(packageName);
- getLog().debug("type definintions" + config.getTypeDefs());
+ getLog().debug("Envers-Configuration changed. Enabled: " + envers);
+ modified = true;
+ md5s.put(ENVERS, Boolean.toString(envers));
}
- getLog().debug("Class " + annotatedClass);
- config.addAnnotatedClass(annotatedClass);
}
+ else
+ {
+ modified = true;
+ md5s.put(ENVERS, Boolean.toString(envers));
+ }
+
+ if (config.getProperties().isEmpty())
+ {
+ getLog().error("No properties set!");
+ throw new MojoFailureException("Hibernate configuration is missing!");
+ }
+
+ getLog().info("Gathered hibernate-configuration (turn on debugging for details):");
+ for (Entry