You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2006/08/04 01:36:49 UTC

svn commit: r428565 - in /incubator/openjpa/trunk: openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/

Author: awhite
Date: Thu Aug  3 16:36:48 2006
New Revision: 428565

URL: http://svn.apache.org/viewvc?rev=428565&view=rev
Log:
Fix XML serialization of cascade data.


Modified:
    incubator/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java

Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java?rev=428565&r1=428564&r2=428565&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java Thu Aug  3 16:36:48 2006
@@ -49,19 +49,19 @@
         String jpa = PersistenceProductDerivation.SPEC_JPA;
         String ejb = PersistenceProductDerivation.ALIAS_EJB;
 
-        conf.metaFactoryPlugin.setAlias(jpa,
-            PersistenceMappingFactory.class.getName());
         conf.metaFactoryPlugin.setAlias(ejb,
             PersistenceMappingFactory.class.getName());
-
-        conf.mappingFactoryPlugin.setAlias(jpa,
+        conf.metaFactoryPlugin.setAlias(jpa,
             PersistenceMappingFactory.class.getName());
+
         conf.mappingFactoryPlugin.setAlias(ejb,
             PersistenceMappingFactory.class.getName());
+        conf.mappingFactoryPlugin.setAlias(jpa,
+            PersistenceMappingFactory.class.getName());
 
-        conf.mappingDefaultsPlugin.setAlias(jpa,
-            PersistenceMappingDefaults.class.getName());
         conf.mappingDefaultsPlugin.setAlias(ejb,
+            PersistenceMappingDefaults.class.getName());
+        conf.mappingDefaultsPlugin.setAlias(jpa,
             PersistenceMappingDefaults.class.getName());
     }
 

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=428565&r1=428564&r2=428565&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Thu Aug  3 16:36:48 2006
@@ -44,9 +44,9 @@
             return;
 
         OpenJPAConfigurationImpl conf = (OpenJPAConfigurationImpl) c;
-        conf.metaFactoryPlugin.setAlias(SPEC_JPA,
-            PersistenceMetaDataFactory.class.getName());
         conf.metaFactoryPlugin.setAlias(ALIAS_EJB,
+            PersistenceMetaDataFactory.class.getName());
+        conf.metaFactoryPlugin.setAlias(SPEC_JPA,
             PersistenceMetaDataFactory.class.getName());
     }
 

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java?rev=428565&r1=428564&r2=428565&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java Thu Aug  3 16:36:48 2006
@@ -1025,7 +1025,7 @@
             startElement("cascade");
             for (String cascade : cascades) {
                 startElement(cascade);
-                endElement("cascade");
+                endElement(cascade);
             }
             endElement("cascade");
         }