Changes due to Moving of Axiom to ws-commons
diff --git a/project.xml b/project.xml
index 47ef977..0b49f02 100644
--- a/project.xml
+++ b/project.xml
@@ -228,11 +228,17 @@
</dependency>
<dependency>
<groupId>ws-commons</groupId>
- <artifactId>ws-policy</artifactId>
- <version>SNAPSHOT</version>
+ <artifactId>policy</artifactId>
+ <version>1.0-SNAPSHOT</version>
<properties>
<module>true</module>
</properties>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
</dependency>
</dependencies>
diff --git a/src/endpoints.conf b/src/endpoints.conf
index e4de36b..62021cf 100644
--- a/src/endpoints.conf
+++ b/src/endpoints.conf
@@ -3,8 +3,7 @@
tcpmon_enable=false
COORDINATOR_REPOSITORY=target/testing-repository
COORDINATOR_AXIS2XML=target/testing-repository/axis2.xml
-PARTICIPANT_REPOSITORY=target/testing-repository
-
+PARTICIPANT_REPOSITORY=target/testing-repository
PARTICIPANT_AXIS2_CONF=target/testing-repository/axis2.xml
KANDULA_LISTENER_REPOSITORY=target/initiator-repository
KANDULA_LISTENER_AXIS2XML=target/initiator-repository/axis2.xml
diff --git a/src/org/apache/kandula/context/AbstractContext.java b/src/org/apache/kandula/context/AbstractContext.java
index edd9e7d..0a4ed79 100644
--- a/src/org/apache/kandula/context/AbstractContext.java
+++ b/src/org/apache/kandula/context/AbstractContext.java
@@ -19,7 +19,7 @@
import java.util.HashMap;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.kandula.Status.CoordinatorStatus;
+import org.apache.kandula.Status;
import org.apache.kandula.context.coordination.CoordinationContext;
import org.apache.kandula.utility.EPRHandlingUtils;
import org.apache.kandula.utility.EndpointReferenceFactory;
@@ -33,7 +33,7 @@
protected String activityID;
- private int status = CoordinatorStatus.STATUS_NONE;
+ private int status = Status.CoordinatorStatus.STATUS_NONE;
private boolean locked = false;
@@ -84,7 +84,7 @@
} catch (InterruptedException ex) {
// ignore
}
- if (status == CoordinatorStatus.STATUS_NONE)
+ if (status == Status.CoordinatorStatus.STATUS_NONE)
throw new IllegalStateException();
}
}
diff --git a/src/org/apache/kandula/context/coordination/CoordinationContext.java b/src/org/apache/kandula/context/coordination/CoordinationContext.java
index 67b7a0a..e97e3a4 100644
--- a/src/org/apache/kandula/context/coordination/CoordinationContext.java
+++ b/src/org/apache/kandula/context/coordination/CoordinationContext.java
@@ -17,7 +17,7 @@
package org.apache.kandula.context.coordination;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.om.OMElement;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java b/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java
index e23a5fd..47ea246 100644
--- a/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java
+++ b/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java
@@ -19,12 +19,12 @@
import javax.xml.namespace.QName;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
import org.apache.kandula.Constants;
import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/initiator/TransactionOutHandler.java b/src/org/apache/kandula/initiator/TransactionOutHandler.java
index e1e0a97..598cd78 100644
--- a/src/org/apache/kandula/initiator/TransactionOutHandler.java
+++ b/src/org/apache/kandula/initiator/TransactionOutHandler.java
@@ -19,11 +19,11 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.soap.SOAPHeader;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.coordination.CoordinationContext;
import org.apache.kandula.faults.AbstractKandulaException;
+import org.apache.ws.commons.soap.SOAPHeader;
public class TransactionOutHandler extends AbstractHandler {
diff --git a/src/org/apache/kandula/participant/TransactionInHandler.java b/src/org/apache/kandula/participant/TransactionInHandler.java
index cd27fd6..d787190 100644
--- a/src/org/apache/kandula/participant/TransactionInHandler.java
+++ b/src/org/apache/kandula/participant/TransactionInHandler.java
@@ -24,8 +24,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPHeader;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.at.ATParticipantContext;
@@ -37,6 +35,8 @@
import org.apache.kandula.utility.EPRHandlingUtils;
import org.apache.kandula.utility.EndpointReferenceFactory;
import org.apache.kandula.wscoor.RegistrationCoordinatorPortTypeRawXMLStub;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAPHeader;
public class TransactionInHandler extends AbstractHandler {
private ThreadLocal threadInfo = new ThreadLocal();
diff --git a/src/org/apache/kandula/utility/EPRHandlingUtils.java b/src/org/apache/kandula/utility/EPRHandlingUtils.java
index 7b49502..a3d4c15 100644
--- a/src/org/apache/kandula/utility/EPRHandlingUtils.java
+++ b/src/org/apache/kandula/utility/EPRHandlingUtils.java
@@ -30,10 +30,10 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.AddressingConstants.Final;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.impl.llom.factory.OMLinkedListImplFactory;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.om.impl.llom.factory.OMLinkedListImplFactory;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/utility/EndpointReferenceFactory.java b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
index dd7563a..f9fc1ea 100644
--- a/src/org/apache/kandula/utility/EndpointReferenceFactory.java
+++ b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
@@ -250,4 +250,7 @@
public String getKandulaListenerAxis2Xml() {
return kandulaListenerAxis2Xml;
}
+ public String getLocationForEPR(){
+ return location;
+ }
}
\ No newline at end of file
diff --git a/src/org/apache/kandula/wsat/AbstractATNotifierStub.java b/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
index 9d76991..6445159 100644
--- a/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
+++ b/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
@@ -30,12 +30,14 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
import org.apache.kandula.Constants;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.faults.KandulaGeneralException;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -94,9 +96,9 @@
OperationClient client = operations[opIndex].createClient(
serviceContext, options);
- org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
+ SOAPFactory factory = OMAbstractFactory
.getSOAP12Factory();
- org.apache.axis2.soap.SOAPEnvelope env = factory
+ SOAPEnvelope env = factory
.getDefaultEnvelope();
OMNamespace wsAT = factory.createOMNamespace(Constants.WS_AT,
diff --git a/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
index f604909..fbf4432 100644
--- a/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
@@ -18,12 +18,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.coordinator.at.ATCoordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
index 058a955..9681a4d 100644
--- a/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
@@ -17,11 +17,11 @@
package org.apache.kandula.wsat.completion;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.Status;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.storage.StorageFactory;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
index 9e9dd57..c4f5163 100644
--- a/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
@@ -18,13 +18,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.coordinator.at.ATCoordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.participant.Vote;
import org.apache.kandula.storage.StorageFactory;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
index c7923fa..bf9a0b3 100644
--- a/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
@@ -18,13 +18,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.participant.ParticipantTransactionManager;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.storage.Store;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java b/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
index 08db4a1..59232ef 100644
--- a/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
+++ b/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
@@ -36,15 +36,17 @@
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
import org.apache.kandula.faults.KandulaGeneralException;
import org.apache.kandula.utility.EPRHandlingUtils;
import org.apache.kandula.utility.KandulaListener;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -109,7 +111,7 @@
Options options = new Options();
messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
AddressingConstants.Submission.WSA_NAMESPACE);
- org.apache.axis2.soap.SOAPEnvelope env = createSOAPEnvelope(coordinationType);
+ SOAPEnvelope env = createSOAPEnvelope(coordinationType);
messageContext.setEnvelope(env);
replyToEpr = setupListener();
EPRHandlingUtils.addReferenceProperty(replyToEpr,
@@ -125,11 +127,11 @@
client.execute(false);
}
- private org.apache.axis2.soap.SOAPEnvelope createSOAPEnvelope(
+ private SOAPEnvelope createSOAPEnvelope(
String coordinationType) {
- org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
+ SOAPFactory factory = OMAbstractFactory
.getSOAP12Factory();
- org.apache.axis2.soap.SOAPEnvelope env = factory.getDefaultEnvelope();
+ SOAPEnvelope env = factory.getDefaultEnvelope();
OMNamespace wsCoor = factory.createOMNamespace(Constants.WS_COOR,
"wscoor");
OMElement request = factory.createOMElement(
diff --git a/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java b/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java
index 79b8782..c0b85d9 100644
--- a/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java
+++ b/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java
@@ -19,8 +19,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAPEnvelope;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -44,7 +45,7 @@
ActivationPortTypeRawXMLSkeleton skel = (ActivationPortTypeRawXMLSkeleton) obj;
//Out Envelop
- org.apache.axis2.soap.SOAPEnvelope envelope = null;
+ SOAPEnvelope envelope = null;
//Find the operation that has been set by the Dispatch phase.
AxisOperation op = msgContext.getOperationContext()
.getAxisOperation();
@@ -57,7 +58,7 @@
//doc style
response = skel
- .createCoordinationContextOperation((org.apache.axis2.om.OMElement) msgContext
+ .createCoordinationContextOperation((OMElement) msgContext
.getEnvelope().getBody().getFirstElement()
.detach());
diff --git a/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java
index 5ae4310..6670582 100644
--- a/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java
@@ -20,15 +20,15 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java
index 7f3f16f..cbcfbc3 100644
--- a/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java
@@ -17,11 +17,11 @@
package org.apache.kandula.wscoor;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.coordination.CoordinationContext;
import org.apache.kandula.storage.StorageFactory;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java b/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
index 43f7c0b..9e00402 100644
--- a/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
+++ b/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
@@ -36,9 +36,6 @@
import org.apache.axis2.description.InOnlyAxisOperation;
import org.apache.axis2.description.OutOnlyAxisOperation;
import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
@@ -46,6 +43,11 @@
import org.apache.kandula.faults.KandulaGeneralException;
import org.apache.kandula.utility.EPRHandlingUtils;
import org.apache.kandula.utility.KandulaListener;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -104,7 +106,7 @@
Options options = new Options();
messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
AddressingConstants.Submission.WSA_NAMESPACE);
- org.apache.axis2.soap.SOAPEnvelope env = createSOAPEnvelope(
+ SOAPEnvelope env = createSOAPEnvelope(
protocolType, epr);
messageContext.setEnvelope(env);
replyToEpr = setupListener();
@@ -120,12 +122,12 @@
}
- private org.apache.axis2.soap.SOAPEnvelope createSOAPEnvelope(
+ private SOAPEnvelope createSOAPEnvelope(
String protocolType, EndpointReference epr) {
- org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
+ SOAPFactory factory = OMAbstractFactory
.getSOAP12Factory();
- org.apache.axis2.soap.SOAPEnvelope env = factory.getDefaultEnvelope();
+ SOAPEnvelope env = factory.getDefaultEnvelope();
OMNamespace wsCoor = factory.createOMNamespace(Constants.WS_COOR,
"wscoor");
OMElement request = factory.createOMElement("Register", wsCoor);
diff --git a/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java b/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java
index 3819712..2b7dafb 100644
--- a/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java
+++ b/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java
@@ -19,8 +19,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.soap.SOAPEnvelope;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -44,7 +45,7 @@
RegistrationPortTypeRawXMLSkeleton skel = (RegistrationPortTypeRawXMLSkeleton) obj;
//Out Envelop
- org.apache.axis2.soap.SOAPEnvelope envelope = null;
+ SOAPEnvelope envelope = null;
//Find the operation that has been set by the Dispatch phase.
AxisOperation op = msgContext.getOperationContext()
.getAxisOperation();
@@ -57,7 +58,7 @@
//doc style
response = skel
- .registerOperation((org.apache.axis2.om.OMElement) msgContext
+ .registerOperation((OMElement) msgContext
.getEnvelope().getBody().getFirstElement()
.detach());
diff --git a/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
index 56680d5..4bb01ca 100644
--- a/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
@@ -21,15 +21,15 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPFactory;
import org.apache.kandula.Constants;
import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMElement;
+import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@apache.org"> Thilina Gunarathne </a>
diff --git a/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
index 0e3968c..2fe98d8 100644
--- a/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
@@ -19,12 +19,12 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.at.ATActivityContext;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
index d9ac4ba..cb358fd 100644
--- a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
+++ b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
@@ -90,7 +90,7 @@
tm.begin("target/initiator-repository","target/initiator-repository/axis2.xml");
// Thread.sleep(10000);
KandulaDemoServiceStub stub = new KandulaDemoServiceStub(
- "D:/Dev/kandula_svn/repo",
+ "target/initiator-repository",
new EndpointReference(
"http://localhost:8081/axis2/services/KandulaDemoService"));
stub.creditOperation();
diff --git a/test/org/apache/kandula/integration/KandulaDemoService.java b/test/org/apache/kandula/integration/KandulaDemoService.java
index e5f3797..2eb86f5 100644
--- a/test/org/apache/kandula/integration/KandulaDemoService.java
+++ b/test/org/apache/kandula/integration/KandulaDemoService.java
@@ -16,7 +16,7 @@
*/
package org.apache.kandula.integration;
-import org.apache.axis2.om.OMElement;
+import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
diff --git a/test/org/apache/kandula/integration/KandulaDemoServiceStub.java b/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
index be05e04..c50136f 100644
--- a/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
+++ b/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
@@ -30,7 +30,9 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.OutOnlyAxisOperation;
-import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.ws.commons.om.OMAbstractFactory;
+import org.apache.ws.commons.soap.SOAPEnvelope;
+import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -92,7 +94,7 @@
MessageContext messageContext = new MessageContext();
messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
AddressingConstants.Submission.WSA_NAMESPACE);
- org.apache.axis2.soap.SOAPEnvelope env = createSOAPEnvelope();
+ SOAPEnvelope env = createSOAPEnvelope();
messageContext.setEnvelope(env);
options.setAction("creditOperation");
@@ -106,11 +108,11 @@
}
- private org.apache.axis2.soap.SOAPEnvelope createSOAPEnvelope() {
+ private SOAPEnvelope createSOAPEnvelope() {
- org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
+ SOAPFactory factory = OMAbstractFactory
.getSOAP12Factory();
- org.apache.axis2.soap.SOAPEnvelope env = factory.getDefaultEnvelope();
+ SOAPEnvelope env = factory.getDefaultEnvelope();
return env;
}
