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 de...@apache.org on 2007/11/12 18:46:51 UTC
svn commit: r594228 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
client/Options.java description/AxisService.java
description/OutInAxisOperation.java
Author: deepal
Date: Mon Nov 12 09:46:50 2007
New Revision: 594228
URL: http://svn.apache.org/viewvc?rev=594228&view=rev
Log:
- I had to fix some of the issues that I found while doing the interop with MS
- First when we sending a req with some other replay to need to set a property to indicate that , then Axis2 does not go to wait for the response
- When generating wsdl when someone ask for ?wsld , we generate inconsistent wsdl it has schema import as ?xsd1.xsd and some like just xsd1 so I fixed that to have one convention.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java?rev=594228&r1=594227&r2=594228&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java Mon Nov 12 09:46:50 2007
@@ -101,6 +101,11 @@
// current revision level of this object
private static final int revisionID = REVISION_2;
+ //I am going to set a reply to as customer reply To address ,
+ // so that Axis2 does not need to wait for the reply
+ public static String CUSTOM_REPLYTO_ADDRESS = "CUSTOM_REPLYTO_ADDRESS";
+ public static String CUSTOM_REPLYTO_ADDRESS_TRUE = "true";
+
/**
* Default blocking timeout value.
@@ -882,6 +887,8 @@
senderTransport));
}
}
+
+
/**
* Set the SOAP version to be used.
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=594228&r1=594227&r2=594228&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 Nov 12 09:46:50 2007
@@ -2001,7 +2001,7 @@
XmlSchemaExternal externalSchema = (XmlSchemaExternal) item;
s = externalSchema.getSchema();
- if (s != null && sourceURIToNewLocationMap.get(s.getSourceURI()) == null) {
+ if (s != null && getScheamLocationWithDot(sourceURIToNewLocationMap, s) == null) {
//insert the name into the table
insertIntoNameTable(nameTable, s, sourceURIToNewLocationMap);
//recursively call the same procedure
@@ -2106,13 +2106,21 @@
String newscheamlocation = customSchemaNamePrefix == null ?
//use the default mode
- (getName() + "?xsd=" + sourceURIToNewLocationMap.get(s.getSourceURI())) :
+ (getName() + "?xsd=" + getScheamLocationWithDot(sourceURIToNewLocationMap, s)) :
//custom prefix is present - add the custom prefix
- (customSchemaNamePrefix + sourceURIToNewLocationMap.get(s.getSourceURI()));
+ (customSchemaNamePrefix + getScheamLocationWithDot(sourceURIToNewLocationMap, s));
String schemaLocation = xmlSchemaExternal.getSchemaLocation();
xmlSchemaExternal.setSchemaLocation(newscheamlocation);
importedScheams.put(schemaLocation, newscheamlocation);
}
+ }
+
+ private Object getScheamLocationWithDot(Hashtable sourceURIToNewLocationMap, XmlSchema s) {
+ String o = (String) sourceURIToNewLocationMap.get(s.getSourceURI());
+ if (o !=null && o.indexOf(".") <0){
+ return o + ".xsd";
+ }
+ return o;
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=594228&r1=594227&r2=594228&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Mon Nov 12 09:46:50 2007
@@ -199,8 +199,11 @@
" can not be used with OutInAxisOperationClient , user either "
+ "fireAndForget or sendRobust)");
}
- if (replyTo!=null && !replyTo.hasAnonymousAddress()){
- useAsync = true;
+ String customReeplyTo = (String)options.getProperty(Options.CUSTOM_REPLYTO_ADDRESS);
+ if ( ! (Options.CUSTOM_REPLYTO_ADDRESS_TRUE.equals(customReeplyTo))) {
+ if (replyTo!=null && !replyTo.hasAnonymousAddress()){
+ useAsync = true;
+ }
}
if (useAsync || options.isUseSeparateListener()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org