You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/08/17 09:24:56 UTC
svn commit: r986216 - in /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main: java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java xsd/geronimo-openejb-2.0.1.xsd xsd/geronimo-openejb-2.0.xsd

Author: xuhaihong
Date: Tue Aug 17 07:24:56 2010
New Revision: 986216

URL: http://svn.apache.org/viewvc?rev=986216&view=rev
Log:
GERONIMO-5495 Upgrade the geronimo-openejb-2.0.xsd file for new persistence schema (Patch from viola.lu)

Added:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.1.xsd
      - copied, changed from r985785, geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
Removed:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd
Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=986216&r1=986215&r2=986216&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Tue Aug 17 07:24:56 2010
@@ -947,7 +947,7 @@ public class EjbModuleBuilder implements
             persistenceUnit.setExcludeUnlistedClasses(true);
 
             Persistence persistence = new Persistence();
-            persistence.setVersion("1.0");
+            persistence.setVersion("2.0");
             persistence.getPersistenceUnit().add(persistenceUnit);
 
             geronimoEjbJarType.getPersistence().add(persistence);

Copied: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.1.xsd (from r985785, geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.1.xsd?p2=geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.1.xsd&p1=geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd&r1=985785&r2=986216&rev=986216&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.1.xsd Tue Aug 17 07:24:56 2010
@@ -19,8 +19,8 @@
 -->
 
 <xs:schema
-    xmlns:openejb="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
+    xmlns:openejb="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
@@ -33,7 +33,7 @@
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
-    <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"/>
+    <xs:import namespace="http://java.sun.com/xml/ns/persistence" schemaLocation="http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"/>
 
     <xs:element name="ejb-jar" type="openejb:geronimo-ejb-jarType"/>