You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/04/24 15:11:37 UTC
svn commit: r396539 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/util/Utils.java description/AxisService.java
description/WSDL2AxisServiceBuilder.java
Author: dims
Date: Mon Apr 24 06:11:34 2006
New Revision: 396539
URL: http://svn.apache.org/viewcvs?rev=396539&view=rev
Log:
rename setSchema -> addSchema
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=396539&r1=396538&r2=396539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Mon Apr 24 06:11:34 2006
@@ -170,7 +170,7 @@
SchemaGenerator schemaGenerator = new SchemaGenerator(serviceClassLoader,
serviceClass.trim(), axisService.getSchematargetNamespace(),
axisService.getSchematargetNamespacePrefix());
- axisService.setSchema(schemaGenerator.generateSchema());
+ axisService.addSchema(schemaGenerator.generateSchema());
JMethod [] method = schemaGenerator.getMethods();
TypeTable table = schemaGenerator.getTypeTable();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=396539&r1=396538&r2=396539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Mon Apr 24 06:11:34 2006
@@ -683,12 +683,12 @@
return schemaList;
}
- public void setSchema(XmlSchema schema) {
+ public void addSchema(XmlSchema schema) {
schemaList.add(schema);
addSchemaNameSpace(schema.getTargetNamespace());
}
- public void setSchema(Collection schemas) {
+ public void addSchema(Collection schemas) {
Iterator iterator = schemas.iterator();
while(iterator.hasNext()){
XmlSchema schema = (XmlSchema)iterator.next();
@@ -955,7 +955,7 @@
schemaGenerator = new SchemaGenerator(serviceClassLoader,
implClass, axisService.getSchematargetNamespace(),
axisService.getSchematargetNamespacePrefix());
- axisService.setSchema(schemaGenerator.generateSchema());
+ axisService.addSchema(schemaGenerator.generateSchema());
} catch (Exception e) {
throw new AxisFault(e);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java?rev=396539&r1=396538&r2=396539&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java Mon Apr 24 06:11:34 2006
@@ -216,7 +216,7 @@
Element schemaElement = schemaElements[i];
if (schemaElement != null) {
System.out.println(schemaElement.getNamespaceURI());
- axisService.setSchema(getXMLSchema(schemaElement, null));
+ axisService.addSchema(getXMLSchema(schemaElement, null));
}
}
}
@@ -1033,7 +1033,7 @@
} else if (wsdl4jElement instanceof Schema) {
Schema schema = (Schema) wsdl4jElement;
//just add this schema - no need to worry about the imported ones
- axisService.setSchema(getXMLSchema(schema.getElement(),
+ axisService.addSchema(getXMLSchema(schema.getElement(),
wsdl4jDefinition.getDocumentBaseURI()));
} else if (SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(wsdl4jElement
.getElementType())) {
@@ -1209,27 +1209,6 @@
//TODO Faults ..
}
}
-
-// private void pushSchemaElement(Schema baseSchema,String baseUri) {
-// if (baseSchema == null) {
-// return;
-// }
-// Map map = baseSchema.getImports();
-// Collection values;
-// if (map != null && map.size() > 0) {
-// values = map.values();
-// for (Iterator iterator = values.iterator(); iterator.hasNext();) {
-// //recursively add the schema's
-// Vector v = (Vector) iterator.next();
-// for (int i = 0; i < v.size(); i++) {
-// pushSchemaElement(((SchemaImport) v.get(i))
-// .getReferencedSchema(),baseSchema.getDocumentBaseURI());
-// }
-// }
-// }
-// axisService.setSchema(getXMLSchema(baseSchema.getElement(),
-// baseUri));
-// }
private boolean findWrapForceable(Binding binding) {
List extElements = binding.getExtensibilityElements();