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=96848edc3c367c792fd3ddc3bb123b60c8ff3474;hp=2ad0a29929112e24f90e40364e56c695cd3658f9;hb=97a45d03e1144d30b90f2f566517be22aca39358;hpb=c2135b5dedc55fc9e3f4dd9fe53f8c7b4141204c diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 2ad0a299..96848edc 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -19,6 +19,7 @@ package de.juplo.plugins.hibernate4; import com.pyx4j.log4j.MavenLogAppender; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -28,6 +29,7 @@ import java.math.BigInteger; 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; @@ -48,11 +50,13 @@ import java.util.logging.Logger; import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +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.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 +81,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"; @@ -146,7 +151,7 @@ public class Hbm2DdlMojo extends AbstractMojo * The excecution is skipped automatically, if no modified or newly added * annotated classes are found and the dialect was not changed. * - * @parameter property="maven.test.skip" default-value="false" + * @parameter property="hibernate.export.skip" default-value="false" */ private boolean skip; @@ -197,6 +202,12 @@ public class Hbm2DdlMojo extends AbstractMojo */ private String hibernateDialect; + /** + * Hibernate Naming Strategy + * @parameter property="hibernate.ejb.naming_strategy" + */ + private String hibernateNamingStrategy; + /** * Path to Hibernate configuration file. * @@ -204,15 +215,26 @@ public class Hbm2DdlMojo extends AbstractMojo */ private String hibernateProperties; + /** + * List of Hibernate-Mapping-Files (XML). + * Multiple files can be separated with white-spaces and/or commas. + * + * @parameter property="hibernate.mapping" + */ + 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" */ private String target; @@ -226,6 +248,8 @@ public class Hbm2DdlMojo extends AbstractMojo *
  • BOTH (DEFAULT!)
    • * * + * If NONE is choosen, no databaseconnection is needed. + * * @parameter property="hibernate.export.type" default-value="BOTH" */ private String type; @@ -265,10 +289,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); @@ -297,7 +317,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); } } @@ -336,17 +356,22 @@ 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); + } } Set classNames = new HashSet(); @@ -362,9 +387,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) @@ -398,11 +425,16 @@ public class Hbm2DdlMojo extends AbstractMojo } if (classes.isEmpty()) - throw new MojoFailureException("No annotated classes found in directory " + outputDirectory); - - getLog().debug("Detected classes with mapping-annotations:"); - for (Class annotatedClass : classes) - getLog().debug(" " + annotatedClass.getName()); + { + 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()); + } Properties properties = new Properties(); @@ -468,7 +500,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 +518,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 +558,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) { @@ -521,6 +583,68 @@ public class Hbm2DdlMojo extends AbstractMojo config.addAnnotatedClass(annotatedClass); } + if (hibernateMapping != null) + { + try + { + MessageDigest digest = java.security.MessageDigest.getInstance("MD5"); + for (String filename : hibernateMapping.split("[\\s,]+")) + { + // First try the filename as absolute/relative path + File file = new File(filename); + if (!file.exists()) + { + // 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()) + { + InputStream is = new FileInputStream(file); + byte[] buffer = new byte[1024*4]; // copy data in 4MB-chunks + int i; + while((i = is.read(buffer)) > -1) + digest.update(buffer, 0, i); + is.close(); + byte[] bytes = digest.digest(); + BigInteger bi = new BigInteger(1, bytes); + String newMd5 = String.format("%0" + (bytes.length << 1) + "x", bi); + String oldMd5 = !md5s.containsKey(filename) ? "" : md5s.get(filename); + if (!newMd5.equals(oldMd5)) + { + getLog().debug("Found new or modified mapping-file: " + filename); + modified = true; + md5s.put(filename, newMd5); + } + else + { + getLog().debug(oldMd5 + " -> mapping-file unchanged: " + filename); + } + getLog().debug("Adding mappings from XML-configurationfile: " + file); + config.addFile(file); + } + else + throw new MojoFailureException("File " + filename + " could not be found in any of the configured resource-directories!"); + } + } + catch (NoSuchAlgorithmException e) + { + throw new MojoFailureException("Cannot calculate MD5-summs!", e); + } + catch (FileNotFoundException e) + { + throw new MojoFailureException("Cannot calculate MD5-summs!", e); + } + catch (IOException e) + { + throw new MojoFailureException("Cannot calculate MD5-summs!", e); + } + } + Target target = null; try { @@ -555,7 +679,7 @@ public class Hbm2DdlMojo extends AbstractMojo && !force ) { - getLog().info("No modified annotated classes found and dialect unchanged."); + getLog().info("No modified annotated classes or mapping-files found and dialect unchanged."); getLog().info("Skipping schema generation!"); project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true"); return; @@ -573,6 +697,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: