updating the code base to work with axis2 1.2
diff --git a/conf/inflow-module.xml b/conf/inflow-module.xml
index c7f0576..cedbcc9 100644
--- a/conf/inflow-module.xml
+++ b/conf/inflow-module.xml
@@ -1,14 +1,14 @@
<module name="kandula-inflow">
- <inflow>
+ <InFlow>
<handler name="TransactionInHandler" class="org.apache.kandula.participant.TransactionInHandler">
<order phase="OperationInPhase"/>
</handler>
- </inflow>
- <outflow>
+ </InFlow>
+ <OutFlow>
<handler name="ParticipantOutHandler" class="org.apache.kandula.participant.ba.ParticipantOutHandler">
<order phase="OperationOutPhase"/>
</handler>
- </outflow>
+ </OutFlow>
<OutFaultFlow>
<handler name="ParticipantOutFaultHandler" class="org.apache.kandula.participant.ba.ParticipantOutFaultHandler">
<order phase="OperationOutFaultPhase"/>
diff --git a/conf/outflow-module.xml b/conf/outflow-module.xml
index 062654e..0f260ed 100644
--- a/conf/outflow-module.xml
+++ b/conf/outflow-module.xml
@@ -1,7 +1,7 @@
<module name="kandula-outflow">
- <outflow>
+ <OutFlow>
<handler name="TransactionOutHandler" class="org.apache.kandula.initiator.TransactionOutHandler">
<order phase="MessageOut"/>
</handler>
- </outflow>
+ </OutFlow>
</module>
\ No newline at end of file
diff --git a/project.xml b/project.xml
index 0bb12f9..9e0ff38 100644
--- a/project.xml
+++ b/project.xml
@@ -302,7 +302,7 @@
<build>
<nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
- <!--unitTestSourceDirectory>test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
<unitTest>
<includes>
@@ -327,7 +327,7 @@
</includes>
</resource>
</resources>
- </unitTest-->
+ </unitTest>
<resources>
<resource>
diff --git a/src/org/apache/kandula/Constants.java b/src/org/apache/kandula/Constants.java
index c9c736b..645c344 100644
--- a/src/org/apache/kandula/Constants.java
+++ b/src/org/apache/kandula/Constants.java
@@ -18,6 +18,8 @@
import javax.xml.namespace.QName;
+import org.apache.axis2.addressing.AddressingConstants;
+
public class Constants {
// WS-Coordination URI's
@@ -75,6 +77,8 @@
public static final String WS_BA_PC = WS_BA+ "/ParticipantCompletion";
public static final String WS_BA_CC = WS_BA+ "/CoordinatorCompletion";
+
+ public static final String WSA_NAMESPACE = AddressingConstants.Submission.WSA_NAMESPACE;
// Kandula Specific
// Constants-------------------------------------------------------------
diff --git a/src/org/apache/kandula/context/CoordinationContext.java b/src/org/apache/kandula/context/CoordinationContext.java
index e1ed65d..aaf1ae8 100644
--- a/src/org/apache/kandula/context/CoordinationContext.java
+++ b/src/org/apache/kandula/context/CoordinationContext.java
@@ -24,9 +24,9 @@
public interface CoordinationContext {
public static final class Factory {
- public static CoordinationContext newContext(OMElement contextElement) {
- return new SimpleCoordinationContext(contextElement);
- }
+// public static CoordinationContext newContext(OMElement contextElement) {
+// return new SimpleCoordinationContext(contextElement);
+// }
public static CoordinationContext newContext(String activityId,
String coordinationType, EndpointReference epr) {
diff --git a/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java b/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
index 77b731a..f293f26 100644
--- a/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
+++ b/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
@@ -42,11 +42,11 @@
super();
this.contextElement = contextElement;
activityID = contextElement.getFirstChildWithName(
- new QName("Identifier")).getText();
+ new QName(Constants.WS_COOR,"Identifier")).getText();
coordinationType = contextElement.getFirstChildWithName(
- new QName("CoordinationType")).getText();
+ new QName(Constants.WS_COOR,"CoordinationType")).getText();
OMElement registrationElement = contextElement
- .getFirstChildWithName(new QName("RegistrationService"));
+ .getFirstChildWithName(new QName(Constants.WS_COOR,"RegistrationService"));
registrationServiceEpr = EndpointReferenceFactory
.endpointFromOM(registrationElement);
}
diff --git a/src/org/apache/kandula/initiator/TransactionOutHandler.java b/src/org/apache/kandula/initiator/TransactionOutHandler.java
index 39d693f..dd1837b 100644
--- a/src/org/apache/kandula/initiator/TransactionOutHandler.java
+++ b/src/org/apache/kandula/initiator/TransactionOutHandler.java
@@ -48,14 +48,14 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
String wsaAction = msgContext.getWSAAction();
- if ((wsaAction != Constants.WS_COOR_CREATE_COORDINATIONCONTEXT)
- && (wsaAction != Constants.WS_COOR_REGISTER)
- && (wsaAction != Constants.WS_AT_COMMIT) && (wsaAction != Constants.WS_AT_ROLLBACK)) {
+ if (!(Constants.WS_COOR_CREATE_COORDINATIONCONTEXT.equals(wsaAction))
+ && !(Constants.WS_COOR_REGISTER.equals(wsaAction))
+ && !(Constants.WS_AT_COMMIT.equals(wsaAction)) && !(Constants.WS_AT_ROLLBACK.equals(wsaAction))) {
Object context = null;
try {
context = TransactionManager.getTransaction();
} catch (AbstractKandulaException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
if (context == null) {
context = msgContext.getProperty(Constants.Configuration.TRANSACTION_CONTEXT);
@@ -80,7 +80,7 @@
byteArrayOutputStream.toByteArray())));
context_type32.setExtraAttributes(null);
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
ReferenceParametersType referenceParametersType = context_type32
.getRegistrationService().getReferenceParameters();
diff --git a/src/org/apache/kandula/participant/ParticipantUtility.java b/src/org/apache/kandula/participant/ParticipantUtility.java
index 15ea25d..5b4459f 100644
--- a/src/org/apache/kandula/participant/ParticipantUtility.java
+++ b/src/org/apache/kandula/participant/ParticipantUtility.java
@@ -86,10 +86,9 @@
.getCoordinatorProtocolService()));
} catch (IOException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
} catch (AbstractKandulaException e) {
- AxisFault e1 = new AxisFault(e);
- throw e1;
+ throw AxisFault.makeFault(e);
}
}
}
diff --git a/src/org/apache/kandula/participant/TransactionInHandler.java b/src/org/apache/kandula/participant/TransactionInHandler.java
index 1137825..8bee46e 100644
--- a/src/org/apache/kandula/participant/TransactionInHandler.java
+++ b/src/org/apache/kandula/participant/TransactionInHandler.java
@@ -46,10 +46,9 @@
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
KandulaResource resource;
String wsaAction = msgContext.getWSAAction();
- if ((wsaAction != Constants.WS_COOR_CREATE_COORDINATIONCONTEXT)
- && (wsaAction != Constants.WS_COOR_REGISTER)
- && (wsaAction != Constants.WS_AT_COMMIT)
- && (wsaAction != Constants.WS_AT_ROLLBACK)) {
+ if (!(Constants.WS_COOR_CREATE_COORDINATIONCONTEXT.equals(wsaAction))
+ && !(Constants.WS_COOR_REGISTER.equals(wsaAction))
+ && !(Constants.WS_AT_COMMIT.equals(wsaAction)) && !(Constants.WS_AT_ROLLBACK.equals(wsaAction))){
ParticipantContext context = new ParticipantContext();
SOAPHeader header = msgContext.getEnvelope().getHeader();
OMElement coordinationElement = header
@@ -76,9 +75,13 @@
context.setResource(resource);
} catch (Exception e) {
log.fatal("TransactionInHandler: Activity ID :"+context.getCoordinationContext().getActivityID()+" : "+e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
+ try{
ParticipantUtility.registerParticipant(context,msgContext);
+ }catch (Exception e ){
+ System.out.println(e);
+ }
}
}
return InvocationResponse.CONTINUE;
diff --git a/src/org/apache/kandula/participant/ba/ParticipantOutFaultHandler.java b/src/org/apache/kandula/participant/ba/ParticipantOutFaultHandler.java
index 08725a6..c947e4b 100644
--- a/src/org/apache/kandula/participant/ba/ParticipantOutFaultHandler.java
+++ b/src/org/apache/kandula/participant/ba/ParticipantOutFaultHandler.java
@@ -35,7 +35,7 @@
try {
coordinator.fault(participantContext);
} catch (AbstractKandulaException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
diff --git a/src/org/apache/kandula/participant/ba/ParticipantOutHandler.java b/src/org/apache/kandula/participant/ba/ParticipantOutHandler.java
index 2547230..0e75b49 100644
--- a/src/org/apache/kandula/participant/ba/ParticipantOutHandler.java
+++ b/src/org/apache/kandula/participant/ba/ParticipantOutHandler.java
@@ -38,7 +38,7 @@
participantContext.setStatus(Status.BAParticipantStatus.STATUS_COMPLETING);
coordinator.completed(participantContext);
} catch (AbstractKandulaException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
}
diff --git a/src/org/apache/kandula/utility/EndpointReferenceFactory.java b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
index 16dbaf6..3f1417f 100644
--- a/src/org/apache/kandula/utility/EndpointReferenceFactory.java
+++ b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
@@ -170,15 +170,15 @@
EndpointReference epr;
epr = new EndpointReference(eprElement.getFirstChildWithName(
- new QName(AddressingConstants.Submission.WSA_NAMESPACE,
+ new QName(Constants.WSA_NAMESPACE,
AddressingConstants.EPR_ADDRESS)).getText());
- HashMap referenceProperties = new HashMap();
- OMElement referencePropertiesElement = eprElement.getFirstChildWithName(new QName(
- "ReferenceParameters"));
- if (referencePropertiesElement != null) {
- Iterator propertyIter = referencePropertiesElement.getChildElements();
- while (propertyIter.hasNext()) {
- OMElement element = (OMElement) propertyIter.next();
+ HashMap referenceProperties = new HashMap();
+ OMElement referencePropertiesElement = eprElement.getFirstChildWithName(new QName(
+ Constants.WSA_NAMESPACE, "ReferenceParameters"));
+ if (referencePropertiesElement != null) {
+ Iterator propertyIter = referencePropertiesElement.getChildElements();
+ while (propertyIter.hasNext()) {
+ OMElement element = (OMElement) propertyIter.next();
// TODO do we need to detach the OMElement
referenceProperties.put(element.getQName(), element.cloneOMElement());
@@ -191,7 +191,7 @@
public static void endpointToOM(EndpointReference epr, OMElement parentElement, SOAPFactory factory) {
OMNamespace wsAddressing = factory.createOMNamespace(
- AddressingConstants.Submission.WSA_NAMESPACE,
+ Constants.WSA_NAMESPACE,
AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement addressElement = factory.createOMElement("Address", wsAddressing);
addressElement.setText(epr.getAddress());
@@ -217,7 +217,7 @@
public static OMElement endpointAddressToOM(EndpointReference epr) {
OMFactory factory = OMAbstractFactory.getOMFactory();
OMNamespace wsAddressing = factory.createOMNamespace(
- AddressingConstants.Submission.WSA_NAMESPACE,
+ Constants.WSA_NAMESPACE,
AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement addressElement = factory.createOMElement("Address", wsAddressing);
addressElement.setText(epr.getAddress());
diff --git a/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
index ca783aa..11addec 100644
--- a/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
@@ -47,7 +47,7 @@
coordinator.commitOperation(atContext);
} catch (AbstractKandulaException e) {
e.printStackTrace();
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -70,7 +70,7 @@
}
coordinator.rollbackOperation(atContext);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
diff --git a/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
index ed04210..237705e 100644
--- a/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
@@ -47,7 +47,7 @@
coordinator.countVote(atContext, Vote.PREPARED, enlistmentId);
} catch (AbstractKandulaException e) {
e.printStackTrace();
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -69,7 +69,7 @@
ATActivityContext atContext = (ATActivityContext) StorageUtils.getContext(activityId);
coordinator.abortedOperation(atContext, enlistmentId);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -91,7 +91,7 @@
ATActivityContext atContext = (ATActivityContext) StorageUtils.getContext(activityId);
coordinator.countVote(atContext, Vote.READ_ONLY, enlistmentId);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -113,7 +113,7 @@
ATActivityContext atContext = (ATActivityContext) StorageUtils.getContext(activityId);
coordinator.countParticipantOutcome(atContext, enlistmentId);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
diff --git a/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java b/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
index ee467a9..15d87c5 100644
--- a/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
+++ b/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
@@ -39,7 +39,7 @@
try {
txManager.prepare(context);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -55,7 +55,7 @@
try {
participantTxManager.commit(context);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
@@ -70,7 +70,7 @@
try {
txManager.rollback(context);
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
}
diff --git a/src/org/apache/kandula/wsba/BACoordinatorCompletionCoordinatorServiceSkeleton.java b/src/org/apache/kandula/wsba/BACoordinatorCompletionCoordinatorServiceSkeleton.java
index 5a86223..103b45a 100644
--- a/src/org/apache/kandula/wsba/BACoordinatorCompletionCoordinatorServiceSkeleton.java
+++ b/src/org/apache/kandula/wsba/BACoordinatorCompletionCoordinatorServiceSkeleton.java
@@ -60,7 +60,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CompensatedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -93,7 +93,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : ClosedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -128,7 +128,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : ExitOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -161,7 +161,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CompletedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -222,7 +222,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : FailOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -266,7 +266,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CanceledOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
diff --git a/src/org/apache/kandula/wsba/BACoordinatorCompletionParticipantServiceSkeleton.java b/src/org/apache/kandula/wsba/BACoordinatorCompletionParticipantServiceSkeleton.java
index a09ca85..2e3a955 100644
--- a/src/org/apache/kandula/wsba/BACoordinatorCompletionParticipantServiceSkeleton.java
+++ b/src/org/apache/kandula/wsba/BACoordinatorCompletionParticipantServiceSkeleton.java
@@ -61,7 +61,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : Message ID : " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : close Operation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
AxisFault e = new AxisFault(
@@ -89,7 +89,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : " + context.getCoordinationContext().getActivityID()
+ " : Complete Operation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
log.fatal("WS_BA : Message ID "
@@ -123,7 +123,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : " + context.getCoordinationContext().getActivityID()
+ " : CancelOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else
// participant context migt have been already removed by an earlier
@@ -160,7 +160,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : " + context.getCoordinationContext().getActivityID()
+ " : ExitedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else
// participant context migt have been already removed by an earlier
@@ -202,7 +202,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : Message ID : " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CompensateOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else {
AxisFault e = new AxisFault(
@@ -231,7 +231,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : " + context.getCoordinationContext().getActivityID()
+ " : FailedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} else
// participant context migt have been already removed by an earlier
diff --git a/src/org/apache/kandula/wsba/BAParticipantCompletionCoordinatorServiceSkeleton.java b/src/org/apache/kandula/wsba/BAParticipantCompletionCoordinatorServiceSkeleton.java
index 77fd584..6d99bb8 100644
--- a/src/org/apache/kandula/wsba/BAParticipantCompletionCoordinatorServiceSkeleton.java
+++ b/src/org/apache/kandula/wsba/BAParticipantCompletionCoordinatorServiceSkeleton.java
@@ -37,7 +37,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CompletedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -60,7 +60,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : ClosedOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -82,7 +82,7 @@
} catch (AbstractKandulaException e) {
log.fatal("WS_BA : message " + MessageContext.getCurrentMessageContext().getMessageID()
+ " : CanceledOperation :" + e);
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
diff --git a/src/org/apache/kandula/wscoor/ActivationServiceSkeleton.java b/src/org/apache/kandula/wscoor/ActivationServiceSkeleton.java
index 68a0f26..e9e4846 100644
--- a/src/org/apache/kandula/wscoor/ActivationServiceSkeleton.java
+++ b/src/org/apache/kandula/wscoor/ActivationServiceSkeleton.java
@@ -94,11 +94,11 @@
response.setCreateCoordinationContextResponse(createCoordinationContextResponseType);
return response;
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
} catch (MalformedURIException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
throw fault;
}
diff --git a/src/org/apache/kandula/wscoor/RegistrationServiceSkeleton.java b/src/org/apache/kandula/wscoor/RegistrationServiceSkeleton.java
index 0453f1c..0e04825 100644
--- a/src/org/apache/kandula/wscoor/RegistrationServiceSkeleton.java
+++ b/src/org/apache/kandula/wscoor/RegistrationServiceSkeleton.java
@@ -89,11 +89,11 @@
registerResponse.setRegisterResponse(registerResponseType);
return registerResponse;
} catch (AbstractKandulaException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
fault.setFaultCode(e.getFaultCode());
throw fault;
} catch (MalformedURIException e) {
- AxisFault fault = new AxisFault(e);
+ AxisFault fault = AxisFault.makeFault(e);
throw fault;
}
}
diff --git a/test/interop/testService.java b/test/interop/testService.java
index 1fdd008..707b02f 100644
--- a/test/interop/testService.java
+++ b/test/interop/testService.java
@@ -87,7 +87,7 @@
return getResponseElement();
} catch (KandulaGeneralException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -115,7 +115,7 @@
return getResponseElement();
} catch (KandulaGeneralException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -165,7 +165,7 @@
thread.start();
return getResponseElement();
} catch (KandulaGeneralException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
public OMElement EarlyAborted(OMElement element) throws AxisFault {
@@ -197,11 +197,11 @@
.getCoordinationEPR());
stub.abortedOperation();
} catch (AbstractKandulaException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
return getResponseElement();
} catch (KandulaGeneralException e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
} private OMElement getResponseElement() {
SOAPFactory factory = OMAbstractFactory.getSOAP12Factory();
diff --git a/test/org/apache/kandula/integration/CompletionCommitTest.java b/test/org/apache/kandula/integration/CompletionCommitTest.java
index a9fd8dd..8b72438 100644
--- a/test/org/apache/kandula/integration/CompletionCommitTest.java
+++ b/test/org/apache/kandula/integration/CompletionCommitTest.java
@@ -89,10 +89,11 @@
TransactionManager tm = new TransactionManager("target/initiator-repository",
"target/initiator-repository/axis2.xml");
tm.begin("http://localhost:8081/axis2/services/ActivationCoordinator");
+ stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(100000);
stub.creditOperation(new CreditOperation());
stub.debitOperation(new DebitOperation());
tm.commit();
- Thread.sleep(5000);
+// Thread.sleep(1000);
}
// public void testEchoXMLSync() throws Exception {
