You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2008/02/11 17:32:46 UTC
svn commit: r620517 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Author: pradine
Date: Mon Feb 11 08:32:33 2008
New Revision: 620517
URL: http://svn.apache.org/viewvc?rev=620517&view=rev
Log:
Update schema import fix to work for URI schemes other than http(s).
Also applied fix to wsdl imports. Related to AXIS2-3503.
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?rev=620517&r1=620516&r2=620517&view=diff
==============================================================================
--- 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 Mon Feb 11 08:32:33 2008
@@ -1054,7 +1054,7 @@
for (Iterator valuesIter = values.iterator(); valuesIter.hasNext();) {
wsdlImport = (Import) valuesIter.next();
originalImprotString = wsdlImport.getLocationURI();
- if (!originalImprotString.startsWith("http")){
+ if (originalImprotString.indexOf("://") == -1){
wsdlImport.setLocationURI(this.name + "?wsdl=" + originalImprotString);
}
changeImportAndIncludeLocations(wsdlImport.getDefinition());
@@ -1086,7 +1086,7 @@
attribute = nodeMap.item(i);
if (attribute.getNodeName().equals("schemaLocation")) {
attributeValue = attribute.getNodeValue();
- if (!attributeValue.startsWith("http")) {
+ if (attributeValue.indexOf("://") == -1) {
attribute.setNodeValue(this.name + "?xsd=" + attributeValue);
}
}
@@ -2326,7 +2326,7 @@
if (s != null) {
String schemaLocation = xmlSchemaExternal.getSchemaLocation();
- if (!schemaLocation.startsWith("http")) {
+ if (schemaLocation.indexOf("://") == -1) {
String newscheamlocation = customSchemaNamePrefix == null ?
//use the default mode
(getName() + "?xsd=" + getScheamLocationWithDot(sourceURIToNewLocationMap, s)) :
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org