Reverted r1158146 which was causing a build failure.
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java b/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
index 3e45d24..7a9729f 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
@@ -71,7 +71,6 @@
// add all the schemas to the list
for (AxisService service : configuration.getAxisServices()) {
schemaList.addAll(service.getSchema());
-
}
//hashmap that keeps the targetnamespace and the xmlSchema object
@@ -147,28 +146,6 @@
}
-
- //replace the Axis2 schemas with the processed ones.
- //otherwise it gives some problems if we try to code generate with multiple
- //services with the -uw option.
- //inorder to work for -uw option there must be some metadata with the schema list
-
- Map<String, XmlSchema> loadedSchemaMap = schemaCompiler.getLoadedSchemaMap();
- for (AxisService service : configuration.getAxisServices()) {
- List<XmlSchema> serviceSchemaList = service.getSchema();
- List<XmlSchema> schemaListToAdd = new ArrayList<XmlSchema>();
- for (XmlSchema xmlSchema : serviceSchemaList){
- if (loadedSchemaMap.containsKey(xmlSchema.getTargetNamespace())){
- schemaListToAdd.add(loadedSchemaMap.get(xmlSchema.getTargetNamespace()));
- } else {
- schemaListToAdd.add(xmlSchema);
- }
- }
- service.releaseSchemaList();
- service.addSchema(schemaListToAdd);
- }
-
-
//process the unwrapped parameters
if (!configuration.isParametersWrapped()) {
//figure out the unwrapped operations
diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java b/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
index d855c03..4e2d45c 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
@@ -2809,8 +2809,4 @@
}
return isExists;
}
-
- public Map<String, XmlSchema> getLoadedSchemaMap(){
- return this.loadedSchemaMap;
- }
}
