Author: veithen
Date: Wed Aug 17 19:15:19 2011
New Revision: 1158876
URL: http://svn.apache.org/viewvc?rev=1158876&view=rev
Log:
Reintegrated changes from trunk.
Modified:
axis/axis2/java/core/branches/xmlschema2/ (props changed)
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
axis/axis2/java/core/branches/xmlschema2/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/branches/xmlschema2/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
Propchange: axis/axis2/java/core/branches/xmlschema2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 19:15:19 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1158386-1158848
+/axis/axis2/java/core/trunk:1158386-1158874
Modified:
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?rev=1158876&r1=1158875&r2=1158876&view=diff
==============================================================================
---
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
(original)
+++
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
Wed Aug 17 19:15:19 2011
@@ -71,7 +71,6 @@ public class ExtensionUtility {
// 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 @@ 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<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
Modified:
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1158876&r1=1158875&r2=1158876&view=diff
==============================================================================
---
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/branches/xmlschema2/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Wed Aug 17 19:15:19 2011
@@ -2809,8 +2809,4 @@ public class SchemaCompiler {
}
return isExists;
}
-
- public Map<String, XmlSchema> getLoadedSchemaMap(){
- return this.loadedSchemaMap;
- }
}
Modified:
axis/axis2/java/core/branches/xmlschema2/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/xmlschema2/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1158876&r1=1158875&r2=1158876&view=diff
==============================================================================
---
axis/axis2/java/core/branches/xmlschema2/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
(original)
+++
axis/axis2/java/core/branches/xmlschema2/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
Wed Aug 17 19:15:19 2011
@@ -582,10 +582,7 @@ public class DefaultSchemaGenerator impl
XmlSchemaComplexContentExtension complexExtension =
new XmlSchemaComplexContentExtension();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
schemaTypeName = new QName(targetNameSpace, simpleName,
targetNamespacePrefix);
- eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
Class<?> sup = javaType.getSuperclass();
if ((sup != null)
@@ -641,19 +638,15 @@ public class DefaultSchemaGenerator impl
complexType.setAbstract(true);
}
-// xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
- eltOuter.setSchemaTypeName(complexType.getQName());
-
xmlSchema.getItems().add(complexType);
xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
// adding this type to the table
- typeTable.addComplexSchema(name, eltOuter.getQName());
+ typeTable.addComplexSchema(name, schemaTypeName);
// adding this type's package to the table, to support inheritance.
-
typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()),
eltOuter.getQName());
+
typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()),
schemaTypeName);
- typeTable.addClassNameForQName(eltOuter.getQName(), name);
+ typeTable.addClassNameForQName(schemaTypeName, name);
BeanExcludeInfo beanExcludeInfo = null;
if (service.getExcludeInfo() != null) {
Modified:
axis/axis2/java/core/branches/xmlschema2/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/xmlschema2/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java?rev=1158876&r1=1158875&r2=1158876&view=diff
==============================================================================
---
axis/axis2/java/core/branches/xmlschema2/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
(original)
+++
axis/axis2/java/core/branches/xmlschema2/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
Wed Aug 17 19:15:19 2011
@@ -51,7 +51,7 @@ public class DefaultSchemaGeneratorTest
XmlSchema schema = schemaColl.iterator().next();
boolean foundExtra = false;
- Iterator names = schema.getElements().getNames();
+ Iterator names = schema.getSchemaTypes().getNames();
while (names.hasNext()) {
QName name = (QName) names.next();
if (name.getLocalPart().equals("ExtraClass"))
