You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kandula-dev@ws.apache.org by da...@apache.org on 2006/01/16 22:56:29 UTC

svn commit: r369581 - in /webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator: CallbackRegistry.java CoordinatorImpl.java

Author: dasarath
Date: Mon Jan 16 13:56:27 2006
New Revision: 369581

URL: http://svn.apache.org/viewcvs?rev=369581&view=rev
Log: (empty)

Modified:
    webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CallbackRegistry.java
    webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CoordinatorImpl.java

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CallbackRegistry.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CallbackRegistry.java?rev=369581&r1=369580&r2=369581&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CallbackRegistry.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CallbackRegistry.java Mon Jan 16 13:56:27 2006
@@ -14,9 +14,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.MessageContext;
 import org.apache.axis.message.addressing.AddressingHeaders;
-import org.apache.axis.message.addressing.Constants;
 
 /**
  * @author Dasarath Weeratunge
@@ -77,13 +75,8 @@
 			return (Callback) callbacks.get(s);
 	}
 
-	private AddressingHeaders getAddressingHeaders() {
-		return (AddressingHeaders) MessageContext.getCurrentContext().getProperty(
-			Constants.ENV_ADDRESSING_REQUEST_HEADERS);
-	}
-
 	private String getRef(QName q) {
-		AddressingHeaders headers = getAddressingHeaders();
+		AddressingHeaders headers = org.apache.kandula.utils.AddressingHeaders.getAddressingHeadersOfCurrentMessage();
 		try {
 			return headers.getReferenceProperties().get(q).getValue();
 		} catch (NullPointerException e) {

Modified: webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CoordinatorImpl.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CoordinatorImpl.java?rev=369581&r1=369580&r2=369581&view=diff
==============================================================================
--- webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CoordinatorImpl.java (original)
+++ webservices/kandula/branches/Kandula_1/src/java/org/apache/kandula/coordinator/CoordinatorImpl.java Mon Jan 16 13:56:27 2006
@@ -10,11 +10,8 @@
 import javax.xml.rpc.ServiceException;
 
 import org.apache.axis.AxisFault;
-import org.apache.axis.MessageContext;
 import org.apache.axis.components.uuid.UUIDGen;
 import org.apache.axis.components.uuid.UUIDGenFactory;
-import org.apache.axis.message.addressing.AddressingHeaders;
-import org.apache.axis.message.addressing.Constants;
 import org.apache.axis.message.addressing.EndpointReference;
 import org.apache.axis.types.URI.MalformedURIException;
 import org.apache.kandula.utils.SoapFaultSender;
@@ -26,9 +23,9 @@
  *  
  */
 public abstract class CoordinatorImpl implements Coordinator {
-	
+
 	private String id;
-	
+
 	private CoordinationContext ctx;
 
 	protected CoordinatorImpl(String coordinationType)
@@ -53,43 +50,28 @@
 
 	public synchronized RegisterResponseType registerOperation(
 			RegisterType params) throws RemoteException {
-		
+
 		EndpointReference epr = null;
 		try {
 			epr = register(params.getProtocolIdentifier().toString(),
 				new EndpointReference(params.getParticipantProtocolService()));
-			
+
 		} catch (InvalidCoordinationProtocolException e) {
 			throw INVALID_PROTOCOL_SOAP_FAULT;
-			
+
 		} catch (IllegalStateException e) {
 			throw INVALID_STATE_SOAP_FAULT;
-			
+
 		} catch (IllegalArgumentException e) {
 			throw INVALID_PARAMETERS_SOAP_FAULT;
 		}
-		
+
 		RegisterResponseType r = new RegisterResponseType();
 		r.setCoordinatorProtocolService(epr);
 		return r;
 	}
 
-	protected AddressingHeaders getAddressingHeaders() {
-		return (AddressingHeaders) MessageContext.getCurrentContext().getProperty(
-			Constants.ENV_ADDRESSING_REQUEST_HEADERS);
-	}
-
-	protected EndpointReference getReplyToEpr() {
-		AddressingHeaders headers = getAddressingHeaders();
-		return headers.getReplyTo();
-	}
-
-	protected EndpointReference getFaultToEpr() {
-		AddressingHeaders headers = getAddressingHeaders();
-		return headers.getFaultTo();
-	}
-
-	protected void throwFault(EndpointReference faultTo, AxisFault fault)
+	protected void trigger(EndpointReference faultTo, AxisFault fault)
 			throws AxisFault {
 		try {
 			SoapFaultSender.invoke(faultTo,



---------------------------------------------------------------------
To unsubscribe, e-mail: kandula-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: kandula-dev-help@ws.apache.org