X-Git-Url: https://juplo.de/gitweb/?p=hibernate4-maven-plugin;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=f09cbd676b5d20aaee67832efb691ec8a37c2929;hp=044e3307ec7aa47f2d203426fb7400751fb57777;hb=99a7eaddd1301df0d151f01791e3d177297670aa;hpb=02312592d27d628cc7e0d8e28cc40bf74a80de21 diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 044e3307..f09cbd67 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -47,9 +47,12 @@ import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -57,6 +60,7 @@ 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.envers.configuration.AuditConfiguration; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaExport.Type; import org.hibernate.tool.hbm2ddl.Target; @@ -82,8 +86,12 @@ public class Hbm2DdlMojo extends AbstractMojo 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"; + public final static String ENVERS = "hibernate.export.envers"; + + public final static String MD5S = "schema.md5s"; + + private final static Pattern split = Pattern.compile("[^,\\s]+"); - private final static String MD5S = "schema.md5s"; /** * The maven project. @@ -114,6 +122,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Additonally, all dependencies are scanned for annotated classes. * * @parameter property="project.build.outputDirectory" + * @since 1.0 */ private String outputDirectory; @@ -124,9 +133,26 @@ public class Hbm2DdlMojo extends AbstractMojo * artifact will be scanned for hibernate-annotated classes additionally. * * @parameter property="hibernate.export.scan_testclasses" default-value="false" + * @since 1.0.1 */ private boolean scanTestClasses; + /** + * Dependency-Scopes, that should be scanned for annotated classes. + *

+ * By default, only dependencies in the scope compile are + * scanned for annotated classes. Multiple scopes can be seperated by + * white space or commas. + *

+ * 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. + * + * @parameter property="hibernate.export.scan_dependencies" default-value="compile" + * @since 1.0.3 + */ + private String scanDependencies; + /** * Test-Classes-Directory to scan. *

@@ -137,6 +163,7 @@ public class Hbm2DdlMojo extends AbstractMojo * to true! * * @parameter property="project.build.testOutputDirectory" + * @since 1.0.2 */ private String testOutputDirectory; @@ -152,6 +179,7 @@ public class Hbm2DdlMojo extends AbstractMojo * annotated classes are found and the dialect was not changed. * * @parameter property="maven.test.skip" default-value="false" + * @since 1.0 */ private boolean skip; @@ -164,6 +192,7 @@ public class Hbm2DdlMojo extends AbstractMojo * skip takes precedence over force. * * @parameter property="hibernate.export.force" default-value="false" + * @since 1.0 */ private boolean force; @@ -171,6 +200,7 @@ public class Hbm2DdlMojo extends AbstractMojo * SQL-Driver name. * * @parameter property="hibernate.connection.driver_class" + * @since 1.0 */ private String driverClassName; @@ -178,6 +208,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Database URL. * * @parameter property="hibernate.connection.url" + * @since 1.0 */ private String url; @@ -185,6 +216,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Database username * * @parameter property="hibernate.connection.username" + * @since 1.0 */ private String username; @@ -192,6 +224,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Database password * * @parameter property="hibernate.connection.password" + * @since 1.0 */ private String password; @@ -199,12 +232,15 @@ public class Hbm2DdlMojo extends AbstractMojo * Hibernate dialect. * * @parameter property="hibernate.dialect" + * @since 1.0 */ private String hibernateDialect; /** * Hibernate Naming Strategy + * * @parameter property="hibernate.ejb.naming_strategy" + * @since 1.0.2 */ private String hibernateNamingStrategy; @@ -212,6 +248,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Path to Hibernate configuration file. * * @parameter default-value="${project.build.outputDirectory}/hibernate.properties" + * @since 1.0 */ private String hibernateProperties; @@ -220,19 +257,24 @@ public class Hbm2DdlMojo extends AbstractMojo * Multiple files can be separated with white-spaces and/or commas. * * @parameter property="hibernate.mapping" + * @since 1.0.2 */ private String hibernateMapping; /** * Target of execution: *

* + * A databaseconnection is only needed for EXPORT and BOTH, but a + * Hibernate-Dialect must always be choosen. + * * @parameter property="hibernate.export.target" default-value="EXPORT" + * @since 1.0 */ private String target; @@ -245,7 +287,10 @@ public class Hbm2DdlMojo extends AbstractMojo *
  • BOTH (DEFAULT!)
    • * * + * If NONE is choosen, no databaseconnection is needed. + * * @parameter property="hibernate.export.type" default-value="BOTH" + * @since 1.0 */ private String type; @@ -253,6 +298,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Output file. * * @parameter property="hibernate.export.schema.filename" default-value="${project.build.directory}/schema.sql" + * @since 1.0 */ private String outputFile; @@ -260,6 +306,7 @@ public class Hbm2DdlMojo extends AbstractMojo * Delimiter in output-file. * * @parameter property="hibernate.export.schema.delimiter" default-value=";" + * @since 1.0 */ private String delimiter; @@ -267,9 +314,18 @@ public class Hbm2DdlMojo extends AbstractMojo * Format output-file. * * @parameter property="hibernate.export.schema.format" default-value="true" + * @since 1.0 */ private boolean format; + /** + * Generate envers schema for auditing tables. + * + * @parameter property="hibernate.export.envers" default-value="false" + * @since 1.0.3 + */ + private boolean envers; + @Override public void execute() @@ -284,10 +340,6 @@ public class Hbm2DdlMojo extends AbstractMojo return; } - File dir = new File(outputDirectory); - if (!dir.exists()) - throw new MojoExecutionException("Cannot scan for annotated classes in " + outputDirectory + ": directory does not exist!"); - Map md5s; boolean modified = false; File saved = new File(buildDirectory + File.separator + MD5S); @@ -316,7 +368,7 @@ public class Hbm2DdlMojo extends AbstractMojo } catch (IOException e) { - getLog().warn("Cannot create saved for timestamps: " + e); + getLog().debug("Cannot create file \"" + saved.getPath() + "\" for timestamps: " + e); } } @@ -355,17 +407,50 @@ public class Hbm2DdlMojo extends AbstractMojo try { AnnotationDB db = new AnnotationDB(); - getLog().info("Scanning directory " + outputDirectory + " for annotated classes..."); - URL dirUrl = dir.toURI().toURL(); - db.scanArchives(dirUrl); + File dir = new File(outputDirectory); + if (dir.exists()) + { + getLog().info("Scanning directory " + outputDirectory + " for annotated classes..."); + URL dirUrl = dir.toURI().toURL(); + db.scanArchives(dirUrl); + } if (scanTestClasses) { dir = new File(testOutputDirectory); - if (!dir.exists()) - throw new MojoExecutionException("Cannot scan for annotated test-classes in " + testOutputDirectory + ": directory does not exist!"); - getLog().info("Scanning directory " + testOutputDirectory + " for annotated classes..."); - dirUrl = dir.toURI().toURL(); - db.scanArchives(dirUrl); + if (dir.exists()) + { + getLog().info("Scanning directory " + testOutputDirectory + " for annotated classes..."); + URL dirUrl = dir.toURI().toURL(); + db.scanArchives(dirUrl); + } + } + if (scanDependencies != null) + { + Matcher matcher = split.matcher(scanDependencies); + while (matcher.find()) + { + getLog().info("Scanning dependencies for scope " + matcher.group()); + for (Artifact artifact : project.getDependencyArtifacts()) + { + if (!artifact.getScope().equalsIgnoreCase(matcher.group())) + continue; + if (artifact.getFile() == null) + { + getLog().warn( + "Cannot scan dependency " + + artifact.getId() + + ": no JAR-file available!" + ); + continue; + } + getLog().info( + "Scanning dependency " + + artifact.getId() + + " for annotated classes..." + ); + db.scanArchives(artifact.getFile().toURI().toURL()); + } + } } Set classNames = new HashSet(); @@ -381,9 +466,11 @@ public class Hbm2DdlMojo extends AbstractMojo { Class annotatedClass = classLoader.loadClass(name); classes.add(annotatedClass); + String resourceName = annotatedClass.getName(); + resourceName = resourceName.substring(resourceName.lastIndexOf(".") + 1, resourceName.length()) + ".class"; InputStream is = annotatedClass - .getResourceAsStream(annotatedClass.getSimpleName() + ".class"); + .getResourceAsStream(resourceName); byte[] buffer = new byte[1024*4]; // copy data in 4MB-chunks int i; while((i = is.read(buffer)) > -1) @@ -492,10 +579,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + PASSWORD + "=" + properties.getProperty(PASSWORD) + - " with the value " + password + " with value " + password ); else - getLog().debug("Using the value " + password); + getLog().debug("Using value " + password + " for property " + PASSWORD); properties.setProperty(PASSWORD, password); } if (hibernateDialect != null) @@ -504,10 +591,12 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + DIALECT + "=" + properties.getProperty(DIALECT) + - " with the value " + hibernateDialect + " with value " + hibernateDialect ); else - getLog().debug("Using the value " + hibernateDialect); + getLog().debug( + "Using value " + hibernateDialect + " for property " + DIALECT + ); properties.setProperty(DIALECT, hibernateDialect); } if ( hibernateNamingStrategy != null ) @@ -516,10 +605,13 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) + - " with the value " + hibernateNamingStrategy + " with value " + hibernateNamingStrategy ); else - getLog().debug("Using the value " + hibernateNamingStrategy); + getLog().debug( + "Using value " + hibernateNamingStrategy + " for property " + + NAMING_STRATEGY + ); properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy); } @@ -531,15 +623,45 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug("SQL-dialect unchanged."); else { - getLog().debug("SQL-dialect changed: " + dialect); modified = true; - md5s.put(DIALECT, dialect); + 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 = properties.getProperty(DIALECT); + if (dialect != null) + { + modified = true; + md5s.put(DIALECT, properties.getProperty(DIALECT)); + } + } + + /** 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 + { + getLog().debug("Envers-Configuration changed. Enabled: " + envers); + modified = true; + md5s.put(ENVERS, Boolean.toString(envers)); } } else { modified = true; - md5s.put(DIALECT, properties.getProperty(DIALECT)); + md5s.put(ENVERS, Boolean.toString(envers)); } if (properties.isEmpty()) @@ -582,12 +704,17 @@ public class Hbm2DdlMojo extends AbstractMojo MessageDigest digest = java.security.MessageDigest.getInstance("MD5"); for (String filename : hibernateMapping.split("[\\s,]+")) { - File file = null; - for (Resource resource : project.getResources()) + // First try the filename as absolute/relative path + File file = new File(filename); + if (!file.exists()) { - file = new File(resource.getDirectory() + File.separator + filename); - if (file.exists()) - break; + // If the file was not found, search for it in the resource-directories + for (Resource resource : project.getResources()) + { + file = new File(resource.getDirectory() + File.separator + filename); + if (file.exists()) + break; + } } if (file != null && file.exists()) { @@ -684,6 +811,7 @@ public class Hbm2DdlMojo extends AbstractMojo * hibernate does not use the context-classloader of the current * thread and, hence, would not be able to resolve the driver-class! */ + getLog().debug("Target: " + target + ", Type: " + type); switch (target) { case EXPORT: @@ -738,6 +866,14 @@ public class Hbm2DdlMojo extends AbstractMojo */ Thread.currentThread().setContextClassLoader(classLoader); + config.buildMappings(); + + if (envers) + { + getLog().info("Automatic auditing via hibernate-envers enabled!"); + AuditConfiguration.getFor(config); + } + SchemaExport export = new SchemaExport(config, connection); export.setOutputFile(outputFile); export.setDelimiter(delimiter);