svn commit: r424362 - in /incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence: PersistenceProviderImpl.java PersistenceUnitInfoImpl.java

[pc...@apache.org]

Author: pcl
Date: Fri Jul 21 08:53:31 2006
New Revision: 424362

URL: http://svn.apache.org/viewvc?rev=424362&view=rev
Log:
guarded against null properties; changed the name of the class transformer options to be consistent with other OpenJPA config property names

Modified:
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java?rev=424362&r1=424361&r2=424362&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java Fri Jul 21 08:53:31 2006
@@ -19,6 +19,8 @@
 import java.lang.instrument.IllegalClassFormatException;
 import java.security.ProtectionDomain;
 import java.util.Map;
+import java.util.Properties;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
@@ -33,6 +35,7 @@
 import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
 
+
 /**
  * Bootstrapping class that allows the creation of a stand-alone
  * {@link EntityManager}.
@@ -43,7 +46,7 @@
     implements PersistenceProvider {
 
     static final String CLASS_TRANSFORMER_OPTIONS =
-        "org.apache.openjpa.ClassTransformerOptions";
+        "openjpa.ClassTransformerOptions";
 
     /**
      * Loads the entity manager specified by <code>name</code>, applying
@@ -81,9 +84,12 @@
                 OpenJPAEntityManagerFactory emf =
                     OpenJPAPersistence.toEntityManagerFactory(
                         Bootstrap.newBrokerFactory(cp, cp.getClassLoader()));
+                Properties p = pui.getProperties();
+                String ctOpts = null;
+                if (p != null)
+                    ctOpts = p.getProperty(CLASS_TRANSFORMER_OPTIONS);
                 pui.addTransformer(new ClassTransformerImpl(
-                    emf.getConfiguration(), pui.getProperties().getProperty
-                    (CLASS_TRANSFORMER_OPTIONS),
+                    emf.getConfiguration(), ctOpts,
                     pui.getNewTempClassLoader()));
                 return emf;
             } else
@@ -94,7 +100,7 @@
     }
 
     /**
-     * JEE 5 class transformer.
+     * Java EE 5 class transformer.
      */
     private static class ClassTransformerImpl
         implements ClassTransformer {

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java?rev=424362&r1=424361&r2=424362&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java Fri Jul 21 08:53:31 2006
@@ -40,8 +40,8 @@
 import org.apache.openjpa.util.ClassResolver;
 
 /**
- * Implementation of the {@link PersistenceUnitInfo} interface used by OpenJPA when
- * parsing persistence configuration information.
+ * Implementation of the {@link PersistenceUnitInfo} interface used by OpenJPA 
+ * when parsing persistence configuration information.
  *
  * @nojavadoc
  */