You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/06/28 23:52:46 UTC
svn commit: r958756 -
/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
Author: djencks
Date: Mon Jun 28 21:52:46 2010
New Revision: 958756
URL: http://svn.apache.org/viewvc?rev=958756&view=rev
Log:
GERONIMO-5408 undo mistaken commit
Modified:
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java?rev=958756&r1=958755&r2=958756&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java Mon Jun 28 21:52:46 2010
@@ -101,7 +101,6 @@ public class PersistenceUnitRefBuilder e
checkForGBean(localConfiguration, persistenceUnitNameQuery, true);
} else if (persistenceUnitRef.getPersistenceUnitName() != null && !persistenceUnitRef.getPersistenceUnitName().trim().isEmpty()) {
String persistenceUnitName = persistenceUnitRef.getPersistenceUnitName().trim();
- module.get
persistenceUnitNameQuery = new AbstractNameQuery(null, Collections.singletonMap("name", persistenceUnitName), PERSISTENCE_UNIT_INTERFACE_TYPES);
if (!checkForGBean(localConfiguration, persistenceUnitNameQuery, strictMatching)) {
persistenceUnitName = "persistence/" + persistenceUnitName;
@@ -154,7 +153,8 @@ public class PersistenceUnitRefBuilder e
}
if (!problems.isEmpty()) {
- throw new DeploymentException("At least one deployment problem:", problems);
+ //TODO make DeploymentException accept a list of exceptions as causes.
+ throw new DeploymentException("At least one deployment problem:" + problems);
}
}