axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r441910 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Date Sun, 10 Sep 2006 05:41:00 GMT
Author: ajith
Date: Sat Sep  9 22:40:59 2006
New Revision: 441910

URL: http://svn.apache.org/viewvc?view=rev&rev=441910
Log:
1. Fixed a schema renaming issue where the schema names were not modified in the base schema.
I'm sure this worked previously but it seems some of the intermediate optimizations/modifications
has introduced this bug.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=441910&r1=441909&r2=441910
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Sat Sep  9 22:40:59 2006
@@ -1396,21 +1396,18 @@
         //first traversal - fill the hashtable
         for (int i = 0; i < schemas.size(); i++) {
             XmlSchema schema = (XmlSchema) schemas.get(i);
-
             XmlSchemaObjectCollection includes = schema.getIncludes();
+
             for (int j = 0; j < includes.getCount(); j++) {
                 Object item = includes.getItem(j);
                 XmlSchema s;
                 if (item instanceof XmlSchemaExternal) {
-                    //recursively call the calculating
                     XmlSchemaExternal externalSchema = (XmlSchemaExternal) item;
                     s = externalSchema.getSchema();
                     if (s != null && nameTable.get(s) == null) {
-                        nameTable.put(s,
-                                ("xsd" + count++)
-                                        + (customSchemaNameSuffix != null ?
-                                        customSchemaNameSuffix :
-                                        ""));
+                        //insert the name into the table
+                        insertIntoNameTable(nameTable, s);
+                        //recursively call the same procedure
                         calcualteSchemaNames(Arrays.asList(
                                 new XmlSchema[]{s}),
                                 nameTable);
@@ -1421,34 +1418,70 @@
     }
 
     /**
+     * A quick private sub routine to insert the names
+     * @param nameTable
+     * @param s
+     */
+    private void insertIntoNameTable(Hashtable nameTable, XmlSchema s) {
+        nameTable.put(s,
+                ("xsd" + count++)
+                        + (customSchemaNameSuffix != null ?
+                        customSchemaNameSuffix :
+                        ""));
+    }
+
+    /**
      * Run 2  - adjust the names
      *
-     * @param schemas
      */
     private void adjustSchemaNames(List schemas, Hashtable nameTable) {
-        Enumeration enumeration = nameTable.keys();
-        while (enumeration.hasMoreElements()) {
-            XmlSchema schema = (XmlSchema) enumeration.nextElement();
-            XmlSchemaObjectCollection includes = schema.getIncludes();
+        //process the schemas in the main schema list
+        for (int i = 0; i < schemas.size(); i++) {
+            adjustSchemaName((XmlSchema) schemas.get(i),nameTable);
+        }
+        //process all the rest in the name table
+        Enumeration nameTableKeys = nameTable.keys();
+        while (nameTableKeys.hasMoreElements()) {
+            adjustSchemaName((XmlSchema)nameTableKeys.nextElement(),nameTable);
+
+        }
+    }
+
+    /**
+     * Adjust a single schema
+     * @param parentSchema
+     * @param nameTable
+     */
+    private void adjustSchemaName(XmlSchema parentSchema, Hashtable nameTable) {
+            XmlSchemaObjectCollection includes = parentSchema.getIncludes();
             for (int j = 0; j < includes.getCount(); j++) {
                 Object item = includes.getItem(j);
                 if (item instanceof XmlSchemaExternal) {
-                    //recursively call the name adjusting
                     XmlSchemaExternal xmlSchemaExternal = (XmlSchemaExternal) item;
                     XmlSchema s = xmlSchemaExternal.getSchema();
-                    if (s != null) {
-                        xmlSchemaExternal.setSchemaLocation(
-                                customSchemaNamePrefix == null ?
-                                        //use the default mode
-                                        (getName() +
-                                                "?xsd=" +
-                                                nameTable.get(s)) :
-                                        //custom prefix is present - add the custom prefix
-                                        (customSchemaNamePrefix +
-                                                nameTable.get(s)));
-                    }
+                    adjustSchemaLocation(s, xmlSchemaExternal, nameTable);
                 }
             }
+
+    }
+
+    /**
+     * Adjusts a given schema location
+     * @param s
+     * @param xmlSchemaExternal
+     * @param nameTable
+     */
+    private void adjustSchemaLocation(XmlSchema s, XmlSchemaExternal xmlSchemaExternal, Hashtable
nameTable) {
+        if (s != null) {
+            xmlSchemaExternal.setSchemaLocation(
+                    customSchemaNamePrefix == null ?
+                            //use the default mode
+                            (getName() +
+                                    "?xsd=" +
+                                    nameTable.get(s)) :
+                            //custom prefix is present - add the custom prefix
+                            (customSchemaNamePrefix +
+                                    nameTable.get(s)));
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message