geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r617753 - /geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Date Sat, 02 Feb 2008 06:01:23 GMT
Author: kevan
Date: Fri Feb  1 22:01:19 2008
New Revision: 617753

URL: http://svn.apache.org/viewvc?rev=617753&view=rev
Log:
GERONIMO-2905 tck tests were fixed a while back. We do not need this dd schema version work-around
any longer

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

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=617753&r1=617752&r2=617753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Fri Feb  1 22:01:19 2008
@@ -473,10 +473,6 @@
 
     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;
         }
@@ -487,8 +483,7 @@
         try {
             cursor.toStartDoc();
             cursor.toFirstChild();
-            if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())
-                    || "http://java.sun.com/xml/ns/javaee".equals(cursor.getName().getNamespaceURI()))
{
+            if ("http://java.sun.com/xml/ns/j2ee".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