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 th...@apache.org on 2006/02/10 10:10:09 UTC

svn commit: r376601 - in /webservices/kandula/trunk/java: ./ src/ src/org/apache/kandula/context/ src/org/apache/kandula/coordinator/ src/org/apache/kandula/coordinator/at/ src/org/apache/kandula/faults/ src/org/apache/kandula/initiator/ src/org/apache...

Author: thilina
Date: Fri Feb 10 01:10:05 2006
New Revision: 376601

URL: http://svn.apache.org/viewcvs?rev=376601&view=rev
Log:
Rearranging packages
Introducing seperate KandulaConfiguration.java to handle configuration
EndpointReferenceFactory.java cleaned

Added:
    webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionCoordinator.java
    webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaConfiguration.java
Removed:
    webservices/kandula/trunk/java/src/org/apache/kandula/participant/Participant.java
    webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionManager.java
    webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis1Store.java
    webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis2Store.java
    webservices/kandula/trunk/java/src/org/apache/kandula/utility/EPRHandlingUtils.java
Modified:
    webservices/kandula/trunk/java/project.xml
    webservices/kandula/trunk/java/src/endpoints.conf
    webservices/kandula/trunk/java/src/org/apache/kandula/context/AbstractContext.java
    webservices/kandula/trunk/java/src/org/apache/kandula/context/ContextFactory.java
    webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/Coordinator.java
    webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATCoordinator.java
    webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATSubCoordinator.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/AlreadyRegisteredException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/ContextRefusedException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidParameterException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidProtocolException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidStateException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/KandulaGeneralException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/faults/NoActivityException.java
    webservices/kandula/trunk/java/src/org/apache/kandula/initiator/ATInitiatorTransaction.java
    webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionManager.java
    webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java
    webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java
    webservices/kandula/trunk/java/src/org/apache/kandula/utility/EndpointReferenceFactory.java
    webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaListener.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
    webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
    webservices/kandula/trunk/java/test/org/apache/kandula/coordinator/CoordinatorImplTest.java
    webservices/kandula/trunk/java/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
    webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoServiceStub.java

Modified: webservices/kandula/trunk/java/project.xml
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/project.xml?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/project.xml (original)
+++ webservices/kandula/trunk/java/project.xml Fri Feb 10 01:10:05 2006
@@ -192,7 +192,7 @@
   		<dependency>
             <groupId>ws-commons</groupId>
             <artifactId>XmlSchema</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
  	  <dependency>
             <groupId>axis</groupId>

Modified: webservices/kandula/trunk/java/src/endpoints.conf
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/endpoints.conf?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/endpoints.conf (original)
+++ webservices/kandula/trunk/java/src/endpoints.conf Fri Feb 10 01:10:05 2006
@@ -7,4 +7,4 @@
 PARTICIPANT_AXIS2_CONF=target/testing-repository/axis2.xml
 KANDULA_LISTENER_REPOSITORY=target/initiator-repository
 KANDULA_LISTENER_AXIS2XML=target/initiator-repository/axis2.xml
-KANDULA_LISTENER_PORT=5050
\ No newline at end of file
+KANDULA_LISTENER_PORT=5050

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/context/AbstractContext.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/context/AbstractContext.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/context/AbstractContext.java Fri Feb 10 01:10:05 2006
@@ -20,8 +20,6 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.kandula.Status;
-import org.apache.kandula.context.coordination.CoordinationContext;
-import org.apache.kandula.utility.EPRHandlingUtils;
 import org.apache.kandula.utility.EndpointReferenceFactory;
 
 /**
@@ -51,7 +49,7 @@
 
 	public AbstractContext(String coordinationType) {
 		propertyBag = new HashMap();
-		activityID = EPRHandlingUtils.getRandomStringOf18Characters();
+		activityID = EndpointReferenceFactory.getRandomStringOf18Characters();
 		EndpointReference registrationEpr = EndpointReferenceFactory
 				.getInstance().getRegistrationEndpoint(activityID);
 		coordinationContext = CoordinationContext.Factory.newContext(

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/context/ContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/context/ContextFactory.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/context/ContextFactory.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/context/ContextFactory.java Fri Feb 10 01:10:05 2006
@@ -17,8 +17,7 @@
 package org.apache.kandula.context;
 
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.kandula.context.at.ATActivityContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.faults.InvalidProtocolException;
 
 /**
@@ -40,6 +39,13 @@
 		}
 	}
 
+	/**
+	 * To be used by the initaitor TxManager to create the initial context
+	 * @param protocol
+	 * @param activationEPR
+	 * @return
+	 * @throws InvalidProtocolException
+	 */
 	public AbstractContext createActivity(String protocol,
 			EndpointReference activationEPR) throws InvalidProtocolException {
 		if (org.apache.kandula.Constants.WS_AT.equalsIgnoreCase(protocol)) {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/Coordinator.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/Coordinator.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/Coordinator.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/Coordinator.java Fri Feb 10 01:10:05 2006
@@ -19,7 +19,7 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.kandula.context.AbstractContext;
 import org.apache.kandula.context.ContextFactory;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.storage.StorageFactory;
 import org.apache.kandula.storage.Store;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATCoordinator.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATCoordinator.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATCoordinator.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATCoordinator.java Fri Feb 10 01:10:05 2006
@@ -23,11 +23,10 @@
 import org.apache.kandula.Status;
 import org.apache.kandula.Status.CoordinatorStatus;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.at.ATActivityContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.coordinator.Registerable;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.faults.InvalidStateException;
-import org.apache.kandula.participant.Participant;
 import org.apache.kandula.participant.Vote;
 import org.apache.kandula.storage.StorageFactory;
 import org.apache.kandula.storage.Store;
@@ -216,7 +215,7 @@
 			atContext.unlock();
 			while (volatilePartipantIterator.hasNext()) {
 				atContext.countPreparing();
-				stub.prepareOperation(((Participant) volatilePartipantIterator
+				stub.prepareOperation(((ATParticipantInformation) volatilePartipantIterator
 						.next()).getEpr());
 			}
 		}
@@ -225,7 +224,7 @@
 	public void countVote(String activityID, Vote vote, String enlistmentID)
 			throws AbstractKandulaException {
 		ATActivityContext context = (ATActivityContext) store.get(activityID);
-		Participant participant = context.getParticipant(enlistmentID);
+		ATParticipantInformation participant = context.getParticipant(enlistmentID);
 
 		if (Vote.PREPARED.equals(vote)) {
 			participant.setStatus(Status.CoordinatorStatus.STATUS_PREPARED);
@@ -260,7 +259,7 @@
 			atContext.unlock();
 			while (durablePartipantIterator.hasNext()) {
 				atContext.countPreparing();
-				stub.prepareOperation(((Participant) durablePartipantIterator
+				stub.prepareOperation(((ATParticipantInformation) durablePartipantIterator
 						.next()).getEpr());
 			}
 		}
@@ -284,7 +283,7 @@
 		atContext.unlock();
 		Iterator participants = atContext.getAll2PCParticipants();
 		while (participants.hasNext()) {
-			Participant participant = (Participant) participants.next();
+			ATParticipantInformation participant = (ATParticipantInformation) participants.next();
 			if (!(Status.CoordinatorStatus.STATUS_READ_ONLY == participant
 					.getStatus())) {
 				stub.commitOperation(participant.getEpr());
@@ -313,7 +312,7 @@
 
 		while (participants.hasNext()) {
 			stub
-					.rollbackOperation(((Participant) participants.next())
+					.rollbackOperation(((ATParticipantInformation) participants.next())
 							.getEpr());
 		}
 		CompletionInitiatorPortTypeRawXMLStub completionStub = new CompletionInitiatorPortTypeRawXMLStub(

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATSubCoordinator.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATSubCoordinator.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATSubCoordinator.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/coordinator/at/ATSubCoordinator.java Fri Feb 10 01:10:05 2006
@@ -19,7 +19,7 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.at.ATActivityContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.faults.InvalidProtocolException;
 

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/AlreadyRegisteredException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/AlreadyRegisteredException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/AlreadyRegisteredException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/AlreadyRegisteredException.java Fri Feb 10 01:10:05 2006
@@ -21,6 +21,9 @@
  */
 public class AlreadyRegisteredException extends AbstractKandulaException {
 
+	
+	private static final long serialVersionUID = 354170092780305997L;
+
 	/**
 	 *  
 	 */

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/ContextRefusedException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/ContextRefusedException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/ContextRefusedException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/ContextRefusedException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class ContextRefusedException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8743352104016426531L;
+
+	/**
 	 *  
 	 */
 	public ContextRefusedException() {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidParameterException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidParameterException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidParameterException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidParameterException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class InvalidParameterException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6973003681131477662L;
+
+	/**
 	 *  
 	 */
 	public InvalidParameterException() {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidProtocolException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidProtocolException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidProtocolException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidProtocolException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class InvalidProtocolException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2145946140688935653L;
+
+	/**
 	 *  
 	 */
 	public InvalidProtocolException() {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidStateException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidStateException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidStateException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/InvalidStateException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class InvalidStateException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2526517532679685749L;
+
+	/**
 	 *  
 	 */
 	public InvalidStateException() {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/KandulaGeneralException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/KandulaGeneralException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/KandulaGeneralException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/KandulaGeneralException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class KandulaGeneralException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3605851255933308674L;
+
+	/**
 	 *  
 	 */
 	public KandulaGeneralException(Exception e) {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/faults/NoActivityException.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/faults/NoActivityException.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/faults/NoActivityException.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/faults/NoActivityException.java Fri Feb 10 01:10:05 2006
@@ -22,6 +22,11 @@
 public class NoActivityException extends AbstractKandulaException {
 
 	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1625567169353147393L;
+
+	/**
 	 *  
 	 */
 	public NoActivityException() {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/initiator/ATInitiatorTransaction.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/initiator/ATInitiatorTransaction.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/initiator/ATInitiatorTransaction.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/initiator/ATInitiatorTransaction.java Fri Feb 10 01:10:05 2006
@@ -17,7 +17,7 @@
 package org.apache.kandula.initiator;
 
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
 
 /**
  * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionManager.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionManager.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionManager.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionManager.java Fri Feb 10 01:10:05 2006
@@ -20,7 +20,7 @@
 import org.apache.kandula.Status;
 import org.apache.kandula.context.AbstractContext;
 import org.apache.kandula.context.ContextFactory;
-import org.apache.kandula.context.at.ATActivityContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.faults.InvalidStateException;
 import org.apache.kandula.storage.StorageFactory;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java Fri Feb 10 01:10:05 2006
@@ -21,11 +21,13 @@
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.ws.commons.soap.SOAPHeader;
 
 public class TransactionOutHandler extends AbstractHandler {
+
+	private static final long serialVersionUID = 4133392345837905499L;
 
 	public void invoke(MessageContext msgContext) throws AxisFault {
 

Added: webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionCoordinator.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionCoordinator.java?rev=376601&view=auto
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionCoordinator.java (added)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/participant/ParticipantTransactionCoordinator.java Fri Feb 10 01:10:05 2006
@@ -0,0 +1,111 @@
+/*
+ * Copyright  2004 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.participant;
+
+import org.apache.kandula.Status;
+import org.apache.kandula.context.AbstractContext;
+import org.apache.kandula.context.impl.ATParticipantContext;
+import org.apache.kandula.faults.AbstractKandulaException;
+import org.apache.kandula.faults.InvalidStateException;
+import org.apache.kandula.wsat.twopc.CoordinatorPortTypeRawXMLStub;
+
+/**
+ * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
+ */
+public class ParticipantTransactionCoordinator {
+
+	public void prepare(AbstractContext context)
+			throws AbstractKandulaException {
+		CoordinatorPortTypeRawXMLStub stub;
+		ATParticipantContext atContext = (ATParticipantContext) context;
+		atContext.lock();
+		switch (context.getStatus()) {
+		case (Status.CoordinatorStatus.STATUS_NONE):
+			atContext.unlock();
+			stub = new CoordinatorPortTypeRawXMLStub(atContext
+					.getCoordinationEPR());
+			stub.abortedOperation();
+			break;
+		case (Status.CoordinatorStatus.STATUS_PREPARING):
+		case (Status.CoordinatorStatus.STATUS_PREPARED):
+		case (Status.CoordinatorStatus.STATUS_COMMITTING):
+			//Ignore the message
+			atContext.unlock();
+			break;
+		case (Status.CoordinatorStatus.STATUS_PREPARED_SUCCESS):
+			atContext.unlock();
+			stub = new CoordinatorPortTypeRawXMLStub(atContext
+					.getCoordinationEPR());
+			stub.preparedOperation();
+			break;
+		case (Status.CoordinatorStatus.STATUS_ACTIVE):
+			atContext.setStatus(Status.CoordinatorStatus.STATUS_PREPARING);
+			atContext.unlock();
+			KandulaResource resource = atContext.getResource();
+			Vote vote = resource.prepare();
+			stub = new CoordinatorPortTypeRawXMLStub(atContext
+					.getCoordinationEPR());
+			if (vote == Vote.ABORT) {
+				stub.abortedOperation();
+			} else if (vote == Vote.PREPARED) {
+				stub.preparedOperation();
+			} else if (vote == Vote.READ_ONLY) {
+				stub.readOnlyOperation();
+			}
+			break;
+		default:
+			context.unlock();
+			throw new InvalidStateException();
+		}
+	}
+
+	public void commit(AbstractContext context) throws InvalidStateException {
+		ATParticipantContext atContext = (ATParticipantContext) context;
+		atContext.getResource().commit();
+		//        ATParticipantContext atContext = (ATParticipantContext) context;
+		//        atContext.lock();
+		//        switch (context.getStatus()) {
+		//        case (Status.CoordinatorStatus.STATUS_NONE):
+		//            //TODO send aborted
+		//            atContext.unlock();
+		//            return Vote.ABORT;
+		//        case (Status.CoordinatorStatus.STATUS_PREPARING):
+		//        case (Status.CoordinatorStatus.STATUS_PREPARED):
+		//        case (Status.CoordinatorStatus.STATUS_COMMITTING):
+		//            //Ignore the message
+		//            atContext.unlock();
+		//            return Vote.NONE;
+		//        case (Status.CoordinatorStatus.STATUS_PREPARED_SUCCESS):
+		//            atContext.unlock();
+		//            return Vote.PREPARED;
+		//        case (Status.CoordinatorStatus.STATUS_ACTIVE):
+		//            atContext.setStatus(Status.CoordinatorStatus.STATUS_PREPARING);
+		//            KandulaResource resource = atContext.getResource();
+		//            return resource.prepare();
+		//        default:
+		//            context.unlock();
+		//            throw new InvalidStateException();
+		//        }
+	}
+
+	public void rollback(AbstractContext context) throws InvalidStateException {
+		ATParticipantContext atContext = (ATParticipantContext) context;
+		atContext.getResource().rollback();
+
+	}
+
+}
\ No newline at end of file

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java Fri Feb 10 01:10:05 2006
@@ -26,20 +26,22 @@
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.at.ATParticipantContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
-import org.apache.kandula.context.coordination.SimpleCoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
+import org.apache.kandula.context.impl.ATParticipantContext;
+import org.apache.kandula.context.impl.SimpleCoordinationContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.storage.StorageFactory;
 import org.apache.kandula.storage.Store;
-import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.kandula.utility.KandulaConfiguration;
 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();
+	
+	private static final long serialVersionUID = 2098581248112968550L;
+//	private ThreadLocal threadInfo = new ThreadLocal();
 
 	public void invoke(MessageContext msgContext) throws AxisFault {
 		KandulaResource resource;
@@ -61,9 +63,9 @@
 		// business logic receives the message
 		String resourceFile = (String) msgContext.getParameter(
 				Constants.KANDULA_RESOURCE).getValue();
-		String participantRepository = EndpointReferenceFactory.getInstance()
+		String participantRepository = KandulaConfiguration.getInstance()
 				.getParticipantRepository();
-		String participantAxis2Xml = EndpointReferenceFactory.getInstance()
+		String participantAxis2Xml = KandulaConfiguration.getInstance()
 				.getParticipantAxis2Conf();
 
 		try {
@@ -74,11 +76,11 @@
 		}
 		context.setResource(resource);
 
-		String id = EPRHandlingUtils.getRandomStringOf18Characters();
+		String id = EndpointReferenceFactory.getRandomStringOf18Characters();
 		Store store = StorageFactory.getInstance().getStore();
 		context.setProperty(AbstractContext.REQUESTER_ID, id);
 		store.put(id, context);
-		ParticipantTransactionManager txManager = new ParticipantTransactionManager();
+//		ParticipantTransactionCoordinator txManager = new ParticipantTransactionCoordinator();
 		try {
 			RegistrationCoordinatorPortTypeRawXMLStub stub = new RegistrationCoordinatorPortTypeRawXMLStub(
 					participantRepository, participantAxis2Xml, coorContext

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/utility/EndpointReferenceFactory.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/utility/EndpointReferenceFactory.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/utility/EndpointReferenceFactory.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/utility/EndpointReferenceFactory.java Fri Feb 10 01:10:05 2006
@@ -17,136 +17,40 @@
 package org.apache.kandula.utility;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.InetAddress;
-import java.util.Properties;
+import java.net.UnknownHostException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.AddressingConstants.Final;
 import org.apache.kandula.Constants;
 import org.apache.kandula.wsat.completion.CompletionInitiatorServiceListener;
+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 Dasarath Weeratunge
  * @author <a href="mailto:thilina@apache.org"> Thilina Gunarathne </a>
  */
 
 public class EndpointReferenceFactory {
-	static final String PROPERTY_FILE = "endpoints.conf";
-
-	//  static final String PROTOCOL_PROPERTY = "protocol";
-
-	static final String HOST_PROPERTY = "host";
-
-	static final String PORT_PROPERTY = "port";
-
-	static final String TCPMON_ENABLE = "tcpmon_enable";
-
-	static final String PARTICIPANT_REPO = "PARTICIPANT_REPOSITORY";
-
-	static final String PARTICIPANT_AXIS2_CONF = "PARTICIPANT_AXIS2_CONF";
-
-	static final String KANDULA_LISTENER_REPO = "KANDULA_LISTENER_REPOSITORY";
-
-	static final String KANDULA_LISTENER_AXIS2XML = "KANDULA_LISTENER_AXIS2XML";
-
-	static final String LISTENER_PORT = "KANDULA_LISTENER_PORT";
-
-	static final String COORDINATOR_AXIS2XML = "COORDINATOR_AXIS2XML";
-
-	static final String COORDINATOR_REPOSITORY = "COORDINATOR_REPOSITORY";
 
 	private static EndpointReferenceFactory instance = null;
 
-	Properties properties = null;
-
-	String location = null;
-
-	String participantRepository = null;
-
-	String participantAxis2Xml = null;
-
-	String kandulaListenerRepository = null;
-
-	String kandulaListenerAxis2Xml = null;
-
-	String kandulaListenerPort = null;
-
-	String coordinatorRepo;
-
-	String coordinatorAxis2Conf;
-
-	String debug = "false";
+	private KandulaConfiguration configuration;
 
 	private EndpointReferenceFactory() {
 
-		String port = null;
-
-		String host = null;
-		InputStream in = getClass().getClassLoader().getResourceAsStream(
-				PROPERTY_FILE);
-		properties = new Properties();
-		try {
-			properties.load(in);
-			in.close();
-			host = properties.getProperty(HOST_PROPERTY);
-			port = properties.getProperty(PORT_PROPERTY);
-			participantRepository = properties.getProperty(PARTICIPANT_REPO);
-			if (participantRepository == null) {
-				participantRepository = ".";
-			}
-
-			if (properties.getProperty("tcpmon_enable").equals("true")) {
-				debug = "true";
-			}
-
-			participantAxis2Xml = properties
-					.getProperty(PARTICIPANT_AXIS2_CONF);
-			if (participantAxis2Xml == null) {
-				participantAxis2Xml = "axis2.xml";
-			}
-
-			kandulaListenerRepository = properties
-					.getProperty(KANDULA_LISTENER_REPO);
-			if (kandulaListenerRepository == null) {
-				kandulaListenerRepository = ".";
-			}
-			kandulaListenerAxis2Xml = properties
-					.getProperty(KANDULA_LISTENER_AXIS2XML);
-			if (kandulaListenerAxis2Xml == null) {
-				kandulaListenerRepository += "/axis2.xml";
-			}
-
-			coordinatorAxis2Conf = properties.getProperty(COORDINATOR_AXIS2XML);
-			if (coordinatorAxis2Conf == null) {
-				coordinatorAxis2Conf = "axis2.xml";
-			}
-
-			coordinatorRepo = properties.getProperty(COORDINATOR_REPOSITORY);
-			if (coordinatorRepo == null) {
-				coordinatorAxis2Conf = ".";
-			}
-
-			kandulaListenerPort = properties.getProperty(LISTENER_PORT);
-			if (kandulaListenerPort == null) {
-				kandulaListenerPort = "5050";
-			}
-
-			if (port == null) {
-				port = "8080";
-			}
-
-			if (host == null) {
-				host = InetAddress.getLocalHost().getHostAddress();
-			}
-
-			location = "http://" + host + ":" + port;
-			System.out.println(location);
-		} catch (Exception e) {
-			if (e instanceof RuntimeException)
-				throw (RuntimeException) e;
-			else
-				throw new RuntimeException(e);
-		}
+		configuration = KandulaConfiguration.getInstance();
 
 	}
 
@@ -158,9 +62,10 @@
 
 	public EndpointReference getRegistrationEndpoint(String id) {
 
-		EndpointReference epr = new EndpointReference(location
+		EndpointReference epr = new EndpointReference(configuration
+				.getLocationForEPR()
 				+ "/axis2/services/RegistrationCoordinator");
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.TRANSACTION_ID_PARAMETER, id);
 		return epr;
 	}
@@ -177,80 +82,150 @@
 		CompletionInitiatorServiceListener serviceListener = CompletionInitiatorServiceListener
 				.getInstance();
 		EndpointReference epr = serviceListener.getEpr();
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.REQUESTER_ID_PARAMETER, id);
 		return epr;
 	}
 
 	public EndpointReference getCompletionEndpoint(String id) {
 
-		EndpointReference epr = new EndpointReference(location
+		EndpointReference epr = new EndpointReference(configuration
+				.getLocationForEPR()
 				+ "/axis2/services/CompletionCoordinator");
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.TRANSACTION_ID_PARAMETER, id);
 		return epr;
 	}
 
 	public EndpointReference get2PCCoordinatorEndpoint(String activityId,
 			String enlistmentId) {
-		//Activity ID to find Activity Context , EnlistmentID to find
+		// Activity ID to find Activity Context , EnlistmentID to find
 		// participant in activity
-		EndpointReference epr = new EndpointReference(location
+		EndpointReference epr = new EndpointReference(configuration
+				.getLocationForEPR()
 				+ "/axis2/services/AtomicTransactionCoordinator");
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.TRANSACTION_ID_PARAMETER, activityId);
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.ENLISTMENT_ID_PARAMETER, enlistmentId);
 		return epr;
 	}
 
 	public EndpointReference get2PCParticipantEndpoint(String id) {
 
-		EndpointReference epr = new EndpointReference(location
+		EndpointReference epr = new EndpointReference(configuration
+				.getLocationForEPR()
 				+ "/axis2/services/AtomicTransactionParticipant");
-		EPRHandlingUtils.addReferenceProperty(epr,
+		EndpointReferenceFactory.addReferenceProperty(epr,
 				Constants.REQUESTER_ID_PARAMETER, id);
 		return epr;
 	}
 
-	public String getParticipantRepository() {
-		return participantRepository;
-	}
-
-	public String getParticipantAxis2Conf() {
-		return participantAxis2Xml;
-	}
-
-	public String getCoordinatorRepo() {
-		return coordinatorRepo;
-	}
-
-	public String getCoordinatorAxis2Conf() {
-		return coordinatorAxis2Conf;
-	}
-
-	public String getKadulaListenerPort() {
-		return kandulaListenerPort;
-	}
-
-	public String getKadulaListenerPortForEPR() {
-		if (debug.equals("true"))
-			return (Integer.parseInt(kandulaListenerPort) + 1) + "";
-		else
-			return kandulaListenerPort;
-	}
-
 	/**
-	 * @return Returns the kandulaListenerRepository.
+	 * MD5 a random string with localhost/date etc will return 128 bits
+	 * construct a string of 18 characters from those bits.
+	 * 
+	 * @return string
 	 */
-	public String getKandulaListenerRepository() {
-		return kandulaListenerRepository;
+	public static String getRandomStringOf18Characters() {
+		Random myRand = new Random();
+		long rand = myRand.nextLong();
+		String sid;
+		try {
+			sid = InetAddress.getLocalHost().toString();
+		} catch (UnknownHostException e) {
+			sid = Thread.currentThread().getName();
+		}
+		long time = System.currentTimeMillis();
+		StringBuffer sb = new StringBuffer();
+		sb.append(sid);
+		sb.append(":");
+		sb.append(Long.toString(time));
+		sb.append(":");
+		sb.append(Long.toString(rand));
+		MessageDigest md5 = null;
+		try {
+			md5 = MessageDigest.getInstance("MD5");
+		} catch (NoSuchAlgorithmException e) {
+			// System.out.println("Error: " + e);
+			// todo heve to be properly handle
+		}
+		md5.update(sb.toString().getBytes());
+		byte[] array = md5.digest();
+		StringBuffer sb2 = new StringBuffer();
+		for (int j = 0; j < array.length; ++j) {
+			int b = array[j] & 0xFF;
+			sb2.append(Integer.toHexString(b));
+		}
+		int begin = myRand.nextInt();
+		if (begin < 0)
+			begin = begin * -1;
+		begin = begin % 8;
+		return new String(sb2.toString().substring(begin, begin + 18))
+				.toUpperCase();
 	}
 
-	public String getKandulaListenerAxis2Xml() {
-		return kandulaListenerAxis2Xml;
+	public static void addReferenceProperty(EndpointReference epr, QName key,
+			String Value) {
+		// We'll have to live with reference parameters for the moment
+		// Since Axis2 Addressing does not support ref properties well
+		HashMap refProperties;
+		if ((refProperties = (HashMap) epr.getAllReferenceParameters()) == null) {
+			refProperties = new HashMap();
+		}
+		OMLinkedListImplFactory factory = new OMLinkedListImplFactory();
+		OMElement omElement = factory.createOMElement(key, null);
+		omElement.setText(Value);
+		refProperties.put(key, omElement);
+		epr.setReferenceParameters(refProperties);
+	}
+
+	public static EndpointReference endpointFromOM(OMElement eprElement) {
+		EndpointReference epr;
+		epr = new EndpointReference(eprElement.getFirstChildWithName(
+				new QName("Address")).getText());
+		HashMap referenceProperties = new HashMap();
+		OMElement referencePropertiesElement = eprElement
+				.getFirstChildWithName(new QName("ReferenceParameters"));
+		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());
+		}
+		// will have to live with Ref parameters for some time :: Till axis2
+		// @ing gets stable
+		epr.setReferenceParameters(referenceProperties);
+		return epr;
 	}
-	public String getLocationForEPR(){
-		return location;
+
+	public static void endpointToOM(EndpointReference epr, OMElement parentEPR,
+			SOAPFactory factory) {
+		OMNamespace wsAddressing = factory.createOMNamespace(
+				AddressingConstants.Submission.WSA_NAMESPACE,
+				AddressingConstants.WSA_DEFAULT_PREFIX);
+		OMElement addressElement = factory.createOMElement("Address",
+				wsAddressing);
+		addressElement.setText(epr.getAddress());
+		parentEPR.addChild(addressElement);
+		Map referenceValues = epr.getAllReferenceParameters();
+		if (referenceValues != null) {
+			OMElement refPropertyElement = factory.createOMElement(
+					"ReferenceParameters", wsAddressing);
+			parentEPR.addChild(refPropertyElement);
+			Iterator iterator = referenceValues.keySet().iterator();
+			while (iterator.hasNext()) {
+				QName key = (QName) iterator.next();
+				OMElement omElement = (OMElement) referenceValues.get(key);
+				refPropertyElement.addChild(omElement);
+				if (Final.WSA_NAMESPACE.equals(wsAddressing)) {
+					omElement.addAttribute(
+							Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
+							Final.WSA_TYPE_ATTRIBUTE_VALUE, wsAddressing);
+				}
+			}
+		}
 	}
 }

Added: webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaConfiguration.java?rev=376601&view=auto
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaConfiguration.java (added)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaConfiguration.java Fri Feb 10 01:10:05 2006
@@ -0,0 +1,198 @@
+/*
+ * Copyright  2004 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.utility;
+
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.util.Properties;
+
+
+
+
+/**
+ * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
+ */
+public class KandulaConfiguration {
+	static final String PROPERTY_FILE = "endpoints.conf";
+
+	//  static final String PROTOCOL_PROPERTY = "protocol";
+
+	static final String HOST_PROPERTY = "host";
+
+	static final String PORT_PROPERTY = "port";
+
+	static final String TCPMON_ENABLE = "tcpmon_enable";
+
+	static final String PARTICIPANT_REPO = "PARTICIPANT_REPOSITORY";
+
+	static final String PARTICIPANT_AXIS2_CONF = "PARTICIPANT_AXIS2_CONF";
+
+	static final String KANDULA_LISTENER_REPO = "KANDULA_LISTENER_REPOSITORY";
+
+	static final String KANDULA_LISTENER_AXIS2XML = "KANDULA_LISTENER_AXIS2XML";
+
+	static final String LISTENER_PORT = "KANDULA_LISTENER_PORT";
+
+	static final String COORDINATOR_AXIS2XML = "COORDINATOR_AXIS2XML";
+
+	static final String COORDINATOR_REPOSITORY = "COORDINATOR_REPOSITORY";
+
+	private static KandulaConfiguration instance = null;
+
+	Properties properties = null;
+
+	String location = null;
+
+	String participantRepository = null;
+
+	String participantAxis2Xml = null;
+
+	String kandulaListenerRepository = null;
+
+	String kandulaListenerAxis2Xml = null;
+
+	String kandulaListenerPort = null;
+
+	String coordinatorRepo;
+
+	String coordinatorAxis2Conf;
+
+	String debug = "false";
+
+	private KandulaConfiguration() {
+
+		String port = null;
+
+		String host = null;
+		InputStream in = getClass().getClassLoader().getResourceAsStream(
+				PROPERTY_FILE);
+		properties = new Properties();
+		try {
+			properties.load(in);
+			in.close();
+			host = properties.getProperty(HOST_PROPERTY);
+			port = properties.getProperty(PORT_PROPERTY);
+			participantRepository = properties.getProperty(PARTICIPANT_REPO);
+			if (participantRepository == null) {
+				participantRepository = ".";
+			}
+
+			if (properties.getProperty("tcpmon_enable").equals("true")) {
+				debug = "true";
+			}
+
+			participantAxis2Xml = properties
+					.getProperty(PARTICIPANT_AXIS2_CONF);
+			if (participantAxis2Xml == null) {
+				participantAxis2Xml = "axis2.xml";
+			}
+
+			kandulaListenerRepository = properties
+					.getProperty(KANDULA_LISTENER_REPO);
+			if (kandulaListenerRepository == null) {
+				kandulaListenerRepository = ".";
+			}
+			kandulaListenerAxis2Xml = properties
+					.getProperty(KANDULA_LISTENER_AXIS2XML);
+			if (kandulaListenerAxis2Xml == null) {
+				kandulaListenerRepository += "/axis2.xml";
+			}
+
+			coordinatorAxis2Conf = properties.getProperty(COORDINATOR_AXIS2XML);
+			if (coordinatorAxis2Conf == null) {
+				coordinatorAxis2Conf = "axis2.xml";
+			}
+
+			coordinatorRepo = properties.getProperty(COORDINATOR_REPOSITORY);
+			if (coordinatorRepo == null) {
+				coordinatorAxis2Conf = ".";
+			}
+
+			kandulaListenerPort = properties.getProperty(LISTENER_PORT);
+			if (kandulaListenerPort == null) {
+				kandulaListenerPort = "5050";
+			}
+
+			if (port == null) {
+				port = "8080";
+			}
+
+			if (host == null) {
+				host = InetAddress.getLocalHost().getHostAddress();
+			}
+
+			location = "http://" + host + ":" + port;
+			System.out.println(location);
+		} catch (Exception e) {
+			if (e instanceof RuntimeException)
+				throw (RuntimeException) e;
+			else
+				throw new RuntimeException(e);
+		}
+
+	}
+
+	public static KandulaConfiguration getInstance() {
+		if (instance == null)
+			instance = new KandulaConfiguration();
+		return instance;
+	}
+	public String getParticipantRepository() {
+		return participantRepository;
+	}
+
+	public String getParticipantAxis2Conf() {
+		return participantAxis2Xml;
+	}
+
+	public String getCoordinatorRepo() {
+		return coordinatorRepo;
+	}
+
+	public String getCoordinatorAxis2Conf() {
+		return coordinatorAxis2Conf;
+	}
+
+	public String getKadulaListenerPort() {
+		return kandulaListenerPort;
+	}
+	public String getKadulaListenerPortForEPR() {
+		if (debug.equals("true"))
+			return (Integer.parseInt(kandulaListenerPort) + 1) + "";
+		else
+			return kandulaListenerPort;
+	}
+
+	/**
+	 * @return Returns the kandulaListenerRepository.
+	 */
+	public String getKandulaListenerRepository() {
+		return kandulaListenerRepository;
+	}
+
+	public String getKandulaListenerAxis2Xml() {
+		return kandulaListenerAxis2Xml;
+	}
+	public String getLocationForEPR(){
+		return location;
+	}
+//	public static EndpointReferenceFactory getInstance() {
+//		if (instance == null)
+//			instance = new EndpointReferenceFactory();
+//		return instance;
+//	}
+}
\ No newline at end of file

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaListener.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaListener.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaListener.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaListener.java Fri Feb 10 01:10:05 2006
@@ -45,14 +45,14 @@
 	public int serverPort;
 
 	private KandulaListener() throws IOException {
-		EndpointReferenceFactory endpointReferenceFactory = EndpointReferenceFactory
+		KandulaConfiguration configuration = KandulaConfiguration
 				.getInstance();
 		responseConfigurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
 				.createConfigurationContextFromFileSystem(
-						endpointReferenceFactory.getKandulaListenerRepository(),
-						endpointReferenceFactory.getKandulaListenerAxis2Xml());
+						configuration.getKandulaListenerRepository(),
+						configuration.getKandulaListenerAxis2Xml());
 		try {
-			serverPort = Integer.parseInt(EndpointReferenceFactory
+			serverPort = Integer.parseInt(KandulaConfiguration
 					.getInstance().getKadulaListenerPort());
 		} catch (Exception e) {
 			serverPort = 5059;
@@ -115,7 +115,7 @@
 		return "http://"
 				+ InetAddress.getLocalHost().getHostAddress()
 				+ ":"
-				+ EndpointReferenceFactory.getInstance()
+				+ KandulaConfiguration.getInstance()
 						.getKadulaListenerPortForEPR() + "/axis2/services/";
 	}
 }

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java Fri Feb 10 01:10:05 2006
@@ -19,7 +19,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 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;
@@ -41,7 +40,6 @@
 	 * @throws AxisFault
 	 */
 	public OMElement commitOperation(OMElement requestElement) throws AxisFault {
-		AbstractContext context;
 		String activityId;
 		//log.info("Visited Commit operation");
 		StorageFactory.getInstance().setConfigurationContext(
@@ -63,7 +61,7 @@
 
 	public OMElement rollbackOperation(OMElement requestElement)
 			throws AxisFault {
-		AbstractContext context;
+
 		String activityId;
 		StorageFactory.getInstance().setConfigurationContext(
 				msgContext.getServiceContext().getConfigurationContext());

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java Fri Feb 10 01:10:05 2006
@@ -22,7 +22,7 @@
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;
-import org.apache.kandula.utility.EndpointReferenceFactory;
+import org.apache.kandula.utility.KandulaConfiguration;
 import org.apache.kandula.wsat.AbstractATNotifierStub;
 
 /**
@@ -39,8 +39,8 @@
 	 */
 	public CompletionInitiatorPortTypeRawXMLStub(
 			EndpointReference targetEndpoint) throws AbstractKandulaException {
-		super(EndpointReferenceFactory.getInstance().getCoordinatorRepo(),
-				EndpointReferenceFactory.getInstance()
+		super(KandulaConfiguration.getInstance().getCoordinatorRepo(),
+				KandulaConfiguration.getInstance()
 						.getCoordinatorAxis2Conf(), new AxisService(
 						"CompletionInitiatorPortType"));
 		this.toEPR = targetEndpoint;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java Fri Feb 10 01:10:05 2006
@@ -22,7 +22,7 @@
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;
-import org.apache.kandula.utility.EndpointReferenceFactory;
+import org.apache.kandula.utility.KandulaConfiguration;
 import org.apache.kandula.wsat.AbstractATNotifierStub;
 
 /**
@@ -37,8 +37,8 @@
 	public CoordinatorPortTypeRawXMLStub(EndpointReference targetEndpoint)
 			throws AbstractKandulaException {
 		super(
-				EndpointReferenceFactory.getInstance()
-						.getParticipantRepository(), EndpointReferenceFactory
+				KandulaConfiguration.getInstance()
+						.getParticipantRepository(), KandulaConfiguration
 						.getInstance().getParticipantAxis2Conf(),
 				new AxisService("CoordinatorPortType"));
 		this.toEPR = targetEndpoint;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java Fri Feb 10 01:10:05 2006
@@ -21,7 +21,7 @@
 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.participant.ParticipantTransactionCoordinator;
 import org.apache.kandula.storage.StorageFactory;
 import org.apache.kandula.storage.Store;
 import org.apache.ws.commons.om.OMElement;
@@ -45,7 +45,7 @@
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();
 		AbstractContext context = (AbstractContext) store.get(requesterID);
-		ParticipantTransactionManager txManager = new ParticipantTransactionManager();
+		ParticipantTransactionCoordinator txManager = new ParticipantTransactionCoordinator();
 		try {
 			txManager.prepare(context);
 		} catch (AbstractKandulaException e) {
@@ -65,7 +65,7 @@
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();
 		AbstractContext context = (AbstractContext) store.get(requesterID);
-		ParticipantTransactionManager txManager = new ParticipantTransactionManager();
+		ParticipantTransactionCoordinator txManager = new ParticipantTransactionCoordinator();
 		try {
 			txManager.commit(context);
 		} catch (AbstractKandulaException e) {
@@ -84,7 +84,7 @@
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();
 		AbstractContext context = (AbstractContext) store.get(requesterID);
-		ParticipantTransactionManager txManager = new ParticipantTransactionManager();
+		ParticipantTransactionCoordinator txManager = new ParticipantTransactionCoordinator();
 		try {
 			txManager.rollback(context);
 		} catch (AbstractKandulaException e) {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java Fri Feb 10 01:10:05 2006
@@ -22,7 +22,7 @@
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;
-import org.apache.kandula.utility.EndpointReferenceFactory;
+import org.apache.kandula.utility.KandulaConfiguration;
 import org.apache.kandula.wsat.AbstractATNotifierStub;
 
 /**
@@ -37,8 +37,8 @@
 	 * @throws AbstractKandulaException
 	 */
 	public ParticipantPortTypeRawXMLStub() throws AbstractKandulaException {
-		super(EndpointReferenceFactory.getInstance().getCoordinatorRepo(),
-				EndpointReferenceFactory.getInstance()
+		super(KandulaConfiguration.getInstance().getCoordinatorRepo(),
+				KandulaConfiguration.getInstance()
 						.getCoordinatorAxis2Conf(), new AxisService(
 						"ParticipantPortType"));
 

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java Fri Feb 10 01:10:05 2006
@@ -40,7 +40,7 @@
 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.EndpointReferenceFactory;
 import org.apache.kandula.utility.KandulaListener;
 import org.apache.ws.commons.om.OMAbstractFactory;
 import org.apache.ws.commons.om.OMElement;
@@ -114,7 +114,7 @@
 		SOAPEnvelope env = createSOAPEnvelope(coordinationType);
 		messageContext.setEnvelope(env);
 		replyToEpr = setupListener();
-		EPRHandlingUtils.addReferenceProperty(replyToEpr,
+		EndpointReferenceFactory.addReferenceProperty(replyToEpr,
 				Constants.REQUESTER_ID_PARAMETER, id);
 		options.setReplyTo(replyToEpr);
 		options.setTo(this.toEPR);

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationRequesterPortTypeRawXMLSkeleton.java Fri Feb 10 01:10:05 2006
@@ -19,7 +19,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
 import org.apache.kandula.storage.StorageFactory;
 import org.apache.ws.commons.om.OMElement;
 

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java Fri Feb 10 01:10:05 2006
@@ -41,7 +41,7 @@
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;
 import org.apache.kandula.faults.KandulaGeneralException;
-import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.kandula.utility.EndpointReferenceFactory;
 import org.apache.kandula.utility.KandulaListener;
 import org.apache.ws.commons.om.OMAbstractFactory;
 import org.apache.ws.commons.om.OMElement;
@@ -110,7 +110,7 @@
 				protocolType, epr);
 		messageContext.setEnvelope(env);
 		replyToEpr = setupListener();
-		EPRHandlingUtils.addReferenceProperty(replyToEpr,
+		EndpointReferenceFactory.addReferenceProperty(replyToEpr,
 				Constants.REQUESTER_ID_PARAMETER, id);
 		options.setReplyTo(replyToEpr);
 		options.setTo(this.toEPR);
@@ -138,7 +138,7 @@
 
 		OMElement protocolService = factory.createOMElement(
 				"ParticipantProtocolService", wsCoor);
-		EPRHandlingUtils.endpointToOM(epr, protocolService, factory);
+		EndpointReferenceFactory.endpointToOM(epr, protocolService, factory);
 		request.addChild(protocolService);
 		env.getBody().addChild(request);
 		return env;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java Fri Feb 10 01:10:05 2006
@@ -25,7 +25,7 @@
 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.kandula.utility.EndpointReferenceFactory;
 import org.apache.ws.commons.om.OMAbstractFactory;
 import org.apache.ws.commons.om.OMElement;
 import org.apache.ws.commons.om.OMNamespace;
@@ -57,7 +57,7 @@
 		OMElement participantEPRElement = request
 				.getFirstChildWithName(new QName("ParticipantProtocolService"));
 		//Extracting the participant EPR
-		participantEPR = EPRHandlingUtils.endpointFromOM(participantEPRElement);
+		participantEPR = EndpointReferenceFactory.endpointFromOM(participantEPRElement);
 
 		OMElement header = msgContext.getEnvelope().getHeader();
 		activityId = header.getFirstChildWithName(
@@ -94,7 +94,7 @@
 				"CoordinatorProtocolService", wsCoor);
 		OMElement coordinatorProtocolService = factory.createOMElement(
 				"CoordinatorProtocolService", wsCoor);
-		EPRHandlingUtils.endpointToOM(epr, coordinatorProtocolService, factory);
+		EndpointReferenceFactory.endpointToOM(epr, coordinatorProtocolService, factory);
 		protocolService.addChild(coordinatorProtocolService);
 		return protocolService;
 	}

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java Fri Feb 10 01:10:05 2006
@@ -21,9 +21,9 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.at.ATActivityContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.storage.StorageFactory;
-import org.apache.kandula.utility.EPRHandlingUtils;
+import org.apache.kandula.utility.EndpointReferenceFactory;
 import org.apache.ws.commons.om.OMElement;
 
 /**
@@ -44,7 +44,7 @@
 			OMElement header = msgContext.getEnvelope().getHeader();
 			String requesterID = header.getFirstChildWithName(
 					Constants.REQUESTER_ID_PARAMETER).getText();
-			EndpointReference coordinatorService = EPRHandlingUtils
+			EndpointReference coordinatorService = EndpointReferenceFactory
 					.endpointFromOM(response.getFirstElement());
 			// TODO: remove this
 			ConfigurationContext configurationContext = StorageFactory

Modified: webservices/kandula/trunk/java/test/org/apache/kandula/coordinator/CoordinatorImplTest.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test/org/apache/kandula/coordinator/CoordinatorImplTest.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/test/org/apache/kandula/coordinator/CoordinatorImplTest.java (original)
+++ webservices/kandula/trunk/java/test/org/apache/kandula/coordinator/CoordinatorImplTest.java Fri Feb 10 01:10:05 2006
@@ -22,8 +22,8 @@
 import org.apache.kandula.Constants;
 import org.apache.kandula.Status;
 import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.context.at.ATActivityContext;
-import org.apache.kandula.context.coordination.CoordinationContext;
+import org.apache.kandula.context.CoordinationContext;
+import org.apache.kandula.context.impl.ATActivityContext;
 import org.apache.kandula.faults.AbstractKandulaException;
 
 /**

Modified: webservices/kandula/trunk/java/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test/org/apache/kandula/integration/CreateCoordinationContextTest.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/test/org/apache/kandula/integration/CreateCoordinationContextTest.java (original)
+++ webservices/kandula/trunk/java/test/org/apache/kandula/integration/CreateCoordinationContextTest.java Fri Feb 10 01:10:05 2006
@@ -85,14 +85,14 @@
 		TransactionManager tm = new TransactionManager(
 				Constants.WS_AT,
 				new EndpointReference(
-						"http://localhost:8081/axis2/services/ActivationCoordinator"));
+						"http://localhost:8082/axis2/services/ActivationCoordinator"));
 
 		tm.begin("target/initiator-repository","target/initiator-repository/axis2.xml");
 		// Thread.sleep(10000);
 		KandulaDemoServiceStub stub = new KandulaDemoServiceStub(
 				"target/initiator-repository",
 				new EndpointReference(
-						"http://localhost:8081/axis2/services/KandulaDemoService"));
+						"http://localhost:8082/axis2/services/KandulaDemoService"));
 		stub.creditOperation();
 		// try{
 		tm.commit();

Modified: webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoServiceStub.java?rev=376601&r1=376600&r2=376601&view=diff
==============================================================================
--- webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoServiceStub.java (original)
+++ webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoServiceStub.java Fri Feb 10 01:10:05 2006
@@ -53,10 +53,10 @@
 
 	static {
 
-		//creating the Service
+		// creating the Service
 		_service = new AxisService("KandulaDemoService");
 
-		//creating the operations
+		// creating the operations
 		AxisOperation operationDesc;
 		operations = new org.apache.axis2.description.AxisOperation[1];
 
@@ -73,7 +73,7 @@
 	public KandulaDemoServiceStub(String axis2Home,
 			EndpointReference targetEndpoint) throws java.lang.Exception {
 		this.toEPR = targetEndpoint;
-		//creating the configuration
+		// creating the configuration
 		configurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
 				.createConfigurationContextFromFileSystem(axis2Home, axis2Home
 						+ "/axis2.xml");
@@ -97,10 +97,12 @@
 		SOAPEnvelope env = createSOAPEnvelope();
 		messageContext.setEnvelope(env);
 
+		// _service.engageModule("addressing");
+
 		options.setAction("creditOperation");
 		options.setTo(this.toEPR);
-		//        messageSender
-		//                .setSenderTransport(org.apache.axis2.Constants.TRANSPORT_HTTP);
+		// messageSender
+		// .setSenderTransport(org.apache.axis2.Constants.TRANSPORT_HTTP);
 		OperationClient client = operations[0].createClient(serviceContext,
 				options);
 		client.addMessageContext(messageContext);
@@ -110,8 +112,7 @@
 
 	private SOAPEnvelope createSOAPEnvelope() {
 
-		SOAPFactory factory = OMAbstractFactory
-				.getSOAP12Factory();
+		SOAPFactory factory = OMAbstractFactory.getSOAP12Factory();
 		SOAPEnvelope env = factory.getDefaultEnvelope();
 		return env;
 	}



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