svn commit: r1159105 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java

[amilas]

Author: amilas
Date: Thu Aug 18 09:14:16 2011
New Revision: 1159105

URL: http://svn.apache.org/viewvc?rev=1159105&view=rev
Log:
when adding from the addSchema it checks for null targetnamespaces

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1159105&r1=1159104&r2=1159105&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Thu Aug 18 09:14:16 2011
@@ -2068,9 +2068,8 @@ public class AxisService extends AxisDes
public void addSchema(Collection schemas) {
Iterator iterator = schemas.iterator();
while (iterator.hasNext()) {
-   XmlSchema schema = (XmlSchema) iterator.next();
-   schemaList.add(schema);
-   addSchemaNameSpace(schema);
+   XmlSchema schema = iterator.next();
+addSchema(schema);
}
}
 

svn commit: r1159110 - in /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema: ExtensionUtility.java SchemaCompiler.java

[amilas]

Author: amilas
Date: Thu Aug 18 09:23:46 2011
New Revision: 1159110

URL: http://svn.apache.org/viewvc?rev=1159110&view=rev
Log:
adding back the processed types since some meta data is required for -uw option

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?rev=1159110&r1=1159109&r2=1159110&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
 Thu Aug 18 09:23:46 2011
@@ -146,6 +146,26 @@ public class ExtensionUtility {
 
 }
 
+//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 loadedSchemaMap = 
schemaCompiler.getLoadedSchemaMap();
+for (AxisService service : configuration.getAxisServices()) {
+List serviceSchemaList = service.getSchema();
+List schemaListToAdd = new ArrayList();
+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

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1159110&r1=1159109&r2=1159110&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 Thu Aug 18 09:23:46 2011
@@ -2809,4 +2809,8 @@ public class SchemaCompiler {
 }
return isExists;
 }
+
+public Map getLoadedSchemaMap(){
+return this.loadedSchemaMap;
+}
 }