Rearranging packages
Introducing seperate KandulaConfiguration.java to handle configuration
EndpointReferenceFactory.java cleaned
diff --git a/src/org/apache/kandula/context/coordination/CoordinationContext.java b/src/org/apache/kandula/context/CoordinationContext.java
similarity index 94%
rename from src/org/apache/kandula/context/coordination/CoordinationContext.java
rename to src/org/apache/kandula/context/CoordinationContext.java
index e97e3a4..c3868d0 100644
--- a/src/org/apache/kandula/context/coordination/CoordinationContext.java
+++ b/src/org/apache/kandula/context/CoordinationContext.java
@@ -14,9 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.kandula.context.coordination;
+package org.apache.kandula.context;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.kandula.context.impl.SimpleCoordinationContext;
import org.apache.ws.commons.om.OMElement;
/**
diff --git a/src/org/apache/kandula/context/at/ATActivityContext.java b/src/org/apache/kandula/context/impl/ATActivityContext.java
similarity index 89%
rename from src/org/apache/kandula/context/at/ATActivityContext.java
rename to src/org/apache/kandula/context/impl/ATActivityContext.java
index 5b851e1..9717e54 100644
--- a/src/org/apache/kandula/context/at/ATActivityContext.java
+++ b/src/org/apache/kandula/context/impl/ATActivityContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.kandula.context.at;
+package org.apache.kandula.context.impl;
import java.util.Hashtable;
import java.util.Iterator;
@@ -24,12 +24,11 @@
import org.apache.kandula.Constants;
import org.apache.kandula.Status;
import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
+import org.apache.kandula.coordinator.at.ATParticipantInformation;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.faults.AlreadyRegisteredException;
import org.apache.kandula.faults.InvalidProtocolException;
-import org.apache.kandula.participant.Participant;
-import org.apache.kandula.utility.EPRHandlingUtils;
import org.apache.kandula.utility.EndpointReferenceFactory;
/**
@@ -86,7 +85,7 @@
*/
public ATActivityContext(EndpointReference activationEPR) {
super();
- this.setProperty(REQUESTER_ID, EPRHandlingUtils
+ this.setProperty(REQUESTER_ID, EndpointReferenceFactory
.getRandomStringOf18Characters());
this.setProperty(ACTIVATION_EPR, activationEPR);
}
@@ -99,7 +98,7 @@
*/
public EndpointReference addParticipant(EndpointReference participantEPR,
String protocol) throws AbstractKandulaException {
- String enlistmentID = EPRHandlingUtils.getRandomStringOf18Characters();
+ String enlistmentID = EndpointReferenceFactory.getRandomStringOf18Characters();
if (Constants.WS_AT_VOLATILE2PC.equals(protocol)) {
addVolatileParticipant(participantEPR, enlistmentID);
return EndpointReferenceFactory.getInstance()
@@ -121,7 +120,7 @@
String enlistmentID) throws AbstractKandulaException {
if (volatileParticipantsTable.contains(participantEPR))
throw new AlreadyRegisteredException();
- Participant participant = new Participant(participantEPR,
+ ATParticipantInformation participant = new ATParticipantInformation(participantEPR,
Constants.WS_AT_VOLATILE2PC, enlistmentID);
volatileParticipantsTable.put(enlistmentID, participant);
}
@@ -131,7 +130,7 @@
if (durableParticipantsTable.contains(participantEPR)) {
throw new AlreadyRegisteredException();
}
- Participant participant = new Participant(participantEPR,
+ ATParticipantInformation participant = new ATParticipantInformation(participantEPR,
Constants.WS_AT_DURABLE2PC, enlistmentID);
durableParticipantsTable.put(enlistmentID, participant);
}
@@ -151,11 +150,11 @@
return list.iterator();
}
- public Participant getParticipant(String enlistmentId) {
+ public ATParticipantInformation getParticipant(String enlistmentId) {
if (volatileParticipantsTable.containsKey(enlistmentId)) {
- return (Participant) volatileParticipantsTable.get(enlistmentId);
+ return (ATParticipantInformation) volatileParticipantsTable.get(enlistmentId);
} else if (durableParticipantsTable.containsKey(enlistmentId)) {
- return (Participant) durableParticipantsTable.get(enlistmentId);
+ return (ATParticipantInformation) durableParticipantsTable.get(enlistmentId);
} else {
return null;
}
diff --git a/src/org/apache/kandula/context/at/ATParticipantContext.java b/src/org/apache/kandula/context/impl/ATParticipantContext.java
similarity index 97%
rename from src/org/apache/kandula/context/at/ATParticipantContext.java
rename to src/org/apache/kandula/context/impl/ATParticipantContext.java
index 651ce01..cf17d5b 100644
--- a/src/org/apache/kandula/context/at/ATParticipantContext.java
+++ b/src/org/apache/kandula/context/impl/ATParticipantContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.kandula.context.at;
+package org.apache.kandula.context.impl;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.kandula.Constants;
diff --git a/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java b/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
similarity index 93%
rename from src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java
rename to src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
index 47ea246..4cb67f1 100644
--- a/src/org/apache/kandula/context/coordination/SimpleCoordinationContext.java
+++ b/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
@@ -14,13 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.kandula.context.coordination;
+package org.apache.kandula.context.impl;
import javax.xml.namespace.QName;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.kandula.Constants;
-import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.kandula.context.CoordinationContext;
+import org.apache.kandula.utility.EndpointReferenceFactory;
import org.apache.ws.commons.om.OMAbstractFactory;
import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.om.OMNamespace;
@@ -56,7 +57,7 @@
new QName("CoordinationType")).getText();
OMElement registrationElement = contextElement
.getFirstChildWithName(new QName("RegistrationService"));
- registrationServiceEpr = EPRHandlingUtils
+ registrationServiceEpr = EndpointReferenceFactory
.endpointFromOM(registrationElement);
}
@@ -123,7 +124,7 @@
contextElement.addChild(coorTypeElement);
OMElement registrationServiceElement = factory.createOMElement(
"RegistrationService", wsCoor);
- EPRHandlingUtils.endpointToOM(registrationServiceEpr,
+ EndpointReferenceFactory.endpointToOM(registrationServiceEpr,
registrationServiceElement, factory);
contextElement.addChild(registrationServiceElement);
return contextElement;
