Upgraded Hibernate

[hibernate4-maven-plugin] / src / main / java / de / juplo / plugins / hibernate / AbstractSchemaMojo.java

diff --git a/src/main/java/de/juplo/plugins/hibernate/AbstractSchemaMojo.java b/src/main/java/de/juplo/plugins/hibernate/AbstractSchemaMojo.java
index 0f143f5..edf8d12 100644 (file)
--- a/src/main/java/de/juplo/plugins/hibernate/AbstractSchemaMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate/AbstractSchemaMojo.java
@@ -490,8 +490,7 @@ public abstract class AbstractSchemaMojo extends AbstractMojo
       LoadedConfig config = loadConfig(configLoader);
       if (config != null)
         properties.putAll(config.getConfigurationValues());
-      ParsedPersistenceXmlDescriptor unit =
-          loadPersistenceUnit(classLoaderService, properties);
+      ParsedPersistenceXmlDescriptor unit = loadPersistenceUnit(properties);
       if (unit != null)
         properties.putAll(unit.getProperties());
 
@@ -1346,53 +1345,51 @@ public abstract class AbstractSchemaMojo extends AbstractMojo
   }
 
   private ParsedPersistenceXmlDescriptor loadPersistenceUnit(
-      ClassLoaderService classLoaderService,
       Properties properties
       )
       throws
         MojoFailureException
   {
-    PersistenceXmlParser parser =
-        new PersistenceXmlParser(
-            classLoaderService,
-            PersistenceUnitTransactionType.RESOURCE_LOCAL
-             );
-
-    Map<String, ParsedPersistenceXmlDescriptor> units =
-        parser.doResolve(properties);
+    List<ParsedPersistenceXmlDescriptor> units =
+        PersistenceXmlParser.locatePersistenceUnits(properties);
 
     if (persistenceUnit == null)
     {
-      Iterator<String> names = units.keySet().iterator();
-      if (!names.hasNext())
+      if (units.isEmpty())
       {
         getLog().info("Found no META-INF/persistence.xml.");
         return null;
       }
 
-      String name = names.next();
-      if (!names.hasNext())
+      if (units.size() == 1)
       {
-          getLog().info("Using persistence-unit " + name);
-          return units.get(name);
+        ParsedPersistenceXmlDescriptor descriptor = units.get(0);
+        getLog().info("Using persistence-unit " + descriptor.getName());
+        return descriptor;
       }
 
       StringBuilder builder = new StringBuilder();
       builder.append("No name provided and multiple persistence units found: ");
-      builder.append(name);
-      while(names.hasNext())
+      Iterator<ParsedPersistenceXmlDescriptor> it = units.iterator();
+      while(it.hasNext())
       {
-        builder.append(", ");
-        builder.append(names.next());
+        builder.append(it.next().getName());
+        if (it.hasNext())
+          builder.append(", ");
       }
       builder.append('.');
       throw new MojoFailureException(builder.toString());
     }
 
-    if (units.containsKey(persistenceUnit))
+    Iterator<ParsedPersistenceXmlDescriptor> it = units.iterator();
+    while(it.hasNext())
     {
-      getLog().info("Using configured persistence-unit " + persistenceUnit);
-      return units.get(persistenceUnit);
+      ParsedPersistenceXmlDescriptor descriptor =  it.next();
+      if (descriptor.getName().equals(persistenceUnit))
+      {
+        getLog().info("Using configured persistence-unit " + persistenceUnit);
+        return descriptor;
+      }
     }
 
     throw new MojoFailureException("Could not find persistence-unit " + persistenceUnit);