diff --git a/src/endpoints.conf b/src/endpoints.conf
index 59aabbe..9f257e9 100644
--- a/src/endpoints.conf
+++ b/src/endpoints.conf
@@ -1,6 +1,6 @@
host=127.0.0.1
-port=8081
-tcpmon_enable=false
+port=8082
+tcpmon_enable=true
COORDINATOR_REPOSITORY=target/testing-repository
COORDINATOR_AXIS2XML=target/testing-repository/axis2.xml
PARTICIPANT_REPOSITORY=target/testing-repository
diff --git a/src/org/apache/kandula/context/AbstractContext.java b/src/org/apache/kandula/context/AbstractContext.java
index cf9c1e4..ae20564 100644
--- a/src/org/apache/kandula/context/AbstractContext.java
+++ b/src/org/apache/kandula/context/AbstractContext.java
@@ -49,7 +49,7 @@
public AbstractContext(String coordinationType) {
propertyBag = new HashMap();
- activityID = EndpointReferenceFactory.getRandomStringOf18Characters();
+ activityID = "urn:"+EndpointReferenceFactory.getRandomStringOf18Characters();
EndpointReference registrationEpr = EndpointReferenceFactory
.getInstance().getRegistrationEndpoint(activityID);
coordinationContext = CoordinationContext.Factory.newContext(
diff --git a/src/org/apache/kandula/coordinator/at/ExecutionCallBack.java b/src/org/apache/kandula/coordinator/at/ExecutionCallBack.java
new file mode 100644
index 0000000..49d2b79
--- /dev/null
+++ b/src/org/apache/kandula/coordinator/at/ExecutionCallBack.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kandula.coordinator.at;
+
+import org.apache.kandula.context.AbstractContext;
+import org.apache.kandula.faults.AbstractKandulaException;
+
+/**
+ * @author <a href="mailto:thilina@apache.org"> Thilina Gunarathne </a>
+ */
+
+public interface ExecutionCallBack {
+
+ public void process(AbstractContext context) throws AbstractKandulaException;
+}
diff --git a/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java b/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java
index d6e3c99..bd6d6aa 100644
--- a/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java
+++ b/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java
@@ -24,7 +24,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
@@ -62,7 +62,7 @@
.getName();
String serviceName = "CompletionInitiatorPortType";
AxisService service = new AxisService(serviceName);
- service.addParameter(new ParameterImpl(
+ service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
service.setFileName(className);
diff --git a/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java b/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java
index f478039..335b748 100644
--- a/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java
+++ b/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java
@@ -24,7 +24,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
@@ -61,7 +61,7 @@
String className = ParticipantPortTypeRawXMLSkeleton.class.getName();
String serviceName = "ParticipantPortType";
AxisService service = new AxisService(serviceName);
- service.addParameter(new ParameterImpl(
+ service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
service.setFileName(className);
diff --git a/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java b/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
index 5ad95ee..9aca1c7 100644
--- a/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
+++ b/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
@@ -36,7 +36,7 @@
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
@@ -111,7 +111,7 @@
MessageContext messageContext = new MessageContext();
Options options = new Options();
messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
- AddressingConstants.Submission.WSA_NAMESPACE);
+ AddressingConstants.Final.WSA_NAMESPACE);
SOAPEnvelope env = createSOAPEnvelope(coordinationType);
messageContext.setEnvelope(env);
replyToEpr = setupListener();
@@ -156,7 +156,7 @@
KandulaListener listener = KandulaListener.getInstance();
AxisService service = new AxisService(serviceName);
- service.addParameter(new ParameterImpl(
+ service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
service.setFileName(className);
diff --git a/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java b/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
index cb7cf2a..9b4b9d6 100644
--- a/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
+++ b/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
@@ -36,7 +36,7 @@
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.description.OutOnlyAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
@@ -156,8 +156,7 @@
KandulaListener listener = KandulaListener.getInstance();
AxisService service = new AxisService(serviceName);
- service.addParameter(new ParameterImpl(
- AbstractMessageReceiver.SERVICE_CLASS, className));
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS, className));
service.setFileName(className);
responseOperationDesc = new InOnlyAxisOperation();