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 du...@apache.org on 2006/04/08 19:16:57 UTC
svn commit: r392561 - in
/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis:
client/AxisClient.java client/Call.java client/Service.java wsa/MIHeader.java
Author: dug
Date: Sat Apr 8 10:16:56 2006
New Revision: 392561
URL: http://svn.apache.org/viewcvs?rev=392561&view=rev
Log:
sync with HEAD
s/enum/ee/ for jdk1.5
add support for wsa:EndpointReference in wsdl
Modified:
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/AxisClient.java
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Call.java
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Service.java
webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/AxisClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/AxisClient.java?rev=392561&r1=392560&r2=392561&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/AxisClient.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/AxisClient.java Sat Apr 8 10:16:56 2006
@@ -24,6 +24,8 @@
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.components.logger.LogFactory;
+import org.apache.axis.components.threadpool.TaskManager;
+import org.apache.axis.components.threadpool.TaskManagerFactory;
import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
import org.apache.axis.handlers.HandlerChainImpl;
import org.apache.axis.handlers.HandlerInfoChainFactory;
@@ -55,6 +57,9 @@
protected static Log log =
LogFactory.getLog(AxisClient.class.getName());
+ protected static TaskManager taskManager =
+ TaskManagerFactory.getTaskManager();
+
MustUnderstandChecker checker = new MustUnderstandChecker(null);
HandlerChain handlerImpl = null ;
RMInterface rmImpl = null ;
@@ -198,7 +203,11 @@
}
}
};
- (new Thread(runnable)).start();
+ if (taskManager == null) {
+ (new Thread(runnable)).start();
+ } else {
+ taskManager.execute(runnable);
+ }
}
public void invokeInbound(MessageContext msgContext) throws Exception {
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Call.java?rev=392561&r1=392560&r2=392561&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Call.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Call.java Sat Apr 8 10:16:56 2006
@@ -74,6 +74,7 @@
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.ParameterMode;
@@ -1650,6 +1651,24 @@
throw new JAXRPCException(
Messages.getMessage("cantSetURI00", "" + exp) );
}
+ }
+ else if ( obj instanceof UnknownExtensibilityElement ) {
+ UnknownExtensibilityElement ee =
+ (UnknownExtensibilityElement) obj ;
+ QName QN1 = new QName( WSAConstants.NS_WSA1, "EndpointReference");
+ QName QN2 = new QName( WSAConstants.NS_WSA2, "EndpointReference");
+ if ( QN1.equals(ee.getElementType()) ||
+ QN2.equals(ee.getElementType()) ) {
+ try {
+ EndpointReference epr =
+ EndpointReference.fromDOM( ee.getElement() );
+ this.setTo( epr );
+ }
+ catch(Exception exp) {
+ throw new JAXRPCException(
+ Messages.getMessage("cantSetURI00", "" + exp));
+ }
+ }
}
}
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Service.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Service.java?rev=392561&r1=392560&r2=392561&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Service.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/client/Service.java Sat Apr 8 10:16:56 2006
@@ -25,6 +25,8 @@
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.WSDLUtils;
import org.apache.axis.utils.XMLUtils;
+import org.apache.axis.wsa.EndpointReference;
+import org.apache.axis.wsa.WSAConstants;
import org.apache.axis.wsdl.gen.Parser;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
@@ -39,6 +41,7 @@
import javax.wsdl.Port;
import javax.wsdl.PortType;
import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.xml.namespace.QName;
import javax.xml.rpc.ServiceException;
import javax.xml.rpc.encoding.TypeMappingRegistry;
@@ -506,6 +509,24 @@
throw new ServiceException(
Messages.getMessage("cantSetURI00", "" + exp));
}
+ }
+ else if ( obj instanceof UnknownExtensibilityElement ) {
+ UnknownExtensibilityElement ee =
+ (UnknownExtensibilityElement) obj ;
+ QName QN1 = new QName( WSAConstants.NS_WSA1, "EndpointReference");
+ QName QN2 = new QName( WSAConstants.NS_WSA2, "EndpointReference");
+ if ( QN1.equals(ee.getElementType()) ||
+ QN2.equals(ee.getElementType()) ) {
+ try {
+ EndpointReference epr =
+ EndpointReference.fromDOM( ee.getElement() );
+ call.setTo( epr );
+ }
+ catch(Exception exp) {
+ throw new ServiceException(
+ Messages.getMessage("cantSetURI00", "" + exp));
+ }
+ }
}
}
Modified: webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java?rev=392561&r1=392560&r2=392561&view=diff
==============================================================================
--- webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java (original)
+++ webservices/axis/trunk/proposals/dug/java/src/org/apache/axis/wsa/MIHeader.java Sat Apr 8 10:16:56 2006
@@ -215,11 +215,11 @@
if ( removeOnGet ) env.removeHeader( header );
}
- Enumeration enum = env.getHeadersByName(ns, "RelatesTo");
- if ( enum.hasMoreElements() ) {
+ Enumeration ee = env.getHeadersByName(ns, "RelatesTo");
+ if ( ee.hasMoreElements() ) {
relatesTo = new Vector();
- while ( enum.hasMoreElements() ) {
- header = (SOAPHeaderElement) enum.nextElement();
+ while ( ee.hasMoreElements() ) {
+ header = (SOAPHeaderElement) ee.nextElement();
String type = header.getAttributeValue(new org.apache.axis.message.PrefixedQName("","RelationshipType", ""));
String uri = header.getValue();
relatesTo.add(new RelatesToProperty(uri, type));