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 2008/03/03 19:21:32 UTC
svn commit: r633225 - in /geronimo/server/trunk/plugins/openjpa:
geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/
geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/
geronimo-persistence-jp...
Author: djencks
Date: Mon Mar 3 10:21:31 2008
New Revision: 633225
URL: http://svn.apache.org/viewvc?rev=633225&view=rev
Log:
GERONIMO-3880 make managed class names always non-null
Modified:
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=633225&r1=633224&r2=633225&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Mon Mar 3 10:21:31 2008
@@ -280,17 +280,17 @@
gbeanData.setAttribute("excludeUnlistedClasses", persistenceUnit.getExcludeUnlistedClasses());
}
- String[] managedClassNameStrings = persistenceUnit.getClass1Array();
- List<String> managedClassNames = (List<String>) gbeanData.getAttribute("managedClassNames");
- for (String managedClassNameString : managedClassNameStrings) {
- managedClassNames.add(managedClassNameString.trim());
- }
- List<String> jarFileUrls = (List<String>) gbeanData.getAttribute("jarFileUrls");
- //add the specified locations in the ear
- String[] jarFileUrlStrings = persistenceUnit.getJarFileArray();
- for (String jarFileUrlString : jarFileUrlStrings) {
- jarFileUrls.add(jarFileUrlString.trim());
- }
+ String[] managedClassNameStrings = persistenceUnit.getClass1Array();
+ List<String> managedClassNames = (List<String>) gbeanData.getAttribute("managedClassNames");
+ for (String managedClassNameString : managedClassNameStrings) {
+ managedClassNames.add(managedClassNameString.trim());
+ }
+ List<String> jarFileUrls = (List<String>) gbeanData.getAttribute("jarFileUrls");
+ //add the specified locations in the ear
+ String[] jarFileUrlStrings = persistenceUnit.getJarFileArray();
+ for (String jarFileUrlString : jarFileUrlStrings) {
+ jarFileUrls.add(jarFileUrlString.trim());
+ }
if (persistenceUnit.isSetProperties()) {
Properties properties = (Properties) gbeanData.getAttribute("properties");
Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=633225&r1=633224&r2=633225&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Mon Mar 3 10:21:31 2008
@@ -54,6 +54,7 @@
*/
public class PersistenceUnitGBean implements GBeanLifecycle {
private static final List<URL> NO_URLS = Collections.emptyList();
+ private static final List<String> NO_STRINGS = Collections.emptyList();
private final String persistenceUnitRoot;
private final PersistenceUnitInfoImpl persistenceUnitInfo;
private final EntityManagerFactory entityManagerFactory;
@@ -84,7 +85,7 @@
Collection<ExtendedEntityManagerRegistry > entityManagerRegistry,
URL configurationBaseURL,
ClassLoader classLoader) throws URISyntaxException, MalformedURLException, ResourceException {
- List<String> mappingFileNames = mappingFileNamesUntyped == null? new ArrayList<String>(): new ArrayList<String>(mappingFileNamesUntyped);
+ List<String> mappingFileNames = mappingFileNamesUntyped == null? NO_STRINGS: new ArrayList<String>(mappingFileNamesUntyped);
this.persistenceUnitRoot = persistenceUnitRoot;
URI configurationBaseURI = new File(configurationBaseURL.getFile()).toURI();
URL rootURL = configurationBaseURI.resolve(persistenceUnitRoot).normalize().toURL();
@@ -95,6 +96,12 @@
URL url = configurationBaseURI.resolve(urlString).normalize().toURL();
jarFileUrls.add(url);
}
+ }
+ if (managedClassNames == null) {
+ managedClassNames = NO_STRINGS;
+ }
+ if (properties == null) {
+ properties = new Properties();
}
PersistenceUnitTransactionType persistenceUnitTransactionType = persistenceUnitTransactionTypeString == null? PersistenceUnitTransactionType.JTA: PersistenceUnitTransactionType.valueOf(persistenceUnitTransactionTypeString);
Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java?rev=633225&r1=633224&r2=633225&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java Mon Mar 3 10:21:31 2008
@@ -48,7 +48,10 @@
null,
new File("/foo/bar/Root").toURL(),
getClass().getClassLoader());
+ assertNotNull(gbean.getManagedClassNames());
+ assertNotNull(gbean.getProperties());
assertNotNull(gbean.getJarFileUrls());
assertNotNull(gbean.getPersistenceUnitRootUrl());
+ assertNotNull(gbean.getPersistenceProviderClassName());
}
}