geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r513054 - /geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Date Wed, 28 Feb 2007 23:17:37 GMT
Author: djencks
Date: Wed Feb 28 15:17:34 2007
New Revision: 513054

URL: http://svn.apache.org/viewvc?view=rev&rev=513054
Log:
GERONIMO-2905 temporarily accept version 5.0 in addition to the correct version 5

Modified:
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=513054&r1=513053&r2=513054
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Wed Feb 28 15:17:34 2007
@@ -399,6 +399,10 @@
 
     static ApplicationClientDocument convertToApplicationClientSchema(XmlObject xmlObject)
throws XmlException {
         if (ApplicationClientDocument.type.equals(xmlObject.schemaType())) {
+            ApplicationClientType appClient = ((ApplicationClientDocument)xmlObject).getApplicationClient();
+            if ("5.0".equals(appClient.getVersion())) {
+                appClient.setVersion("5");
+            }
             XmlBeansUtil.validateDD(xmlObject);
             return (ApplicationClientDocument) xmlObject;
         }
@@ -409,7 +413,8 @@
         try {
             cursor.toStartDoc();
             cursor.toFirstChild();
-            if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI()))
{
+            if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())
+                    || "http://java.sun.com/xml/ns/javaee".equals(cursor.getName().getNamespaceURI()))
{
                 SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE,
schemaLocationURL, version);
                 XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
                 XmlBeansUtil.validateDD(result);



Mime
View raw message