Author: dasarath
Date: Fri Dec 30 19:57:37 2005
New Revision: 360231
URL: http://svn.apache.org/viewcvs?rev=360231&view=rev
Log: (empty)
Modified:
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/CoordinationService.java
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/Coordinator.java
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/ParticipantService.java
Modified:
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/CoordinationService.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/CoordinationService.java?rev=360231&r1=360230&r2=360231&view=diff
==============================================================================
---
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/CoordinationService.java
(original)
+++
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/CoordinationService.java
Fri Dec 30 19:57:37 2005
@@ -5,8 +5,6 @@
package org.apache.ws.transaction.coordinator;
import java.rmi.RemoteException;
-import java.util.Timer;
-import java.util.TimerTask;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.addressing.EndpointReference;
@@ -44,10 +42,6 @@
"http://schemas.xmlsoap.org/ws/2004/10/wscoor";,
"RegistrationPortTypeRPC");
- public static final long DEFAULT_TIMEOUT_MILLIS = 60 * 60 * 1000;
-
- private Timer timer = new Timer();
-
public static CoordinationService getInstance() {
return instance;
}
@@ -61,12 +55,8 @@
if
(!ATCoordinator.COORDINATION_TYPE_ID.equals(coordinationType))
throw new UnsupportedCoordinationTypeException();
final Coordinator c = new ATCoordinatorImpl();
- CallbackRegistry.getInstance().registerCallback(c.getID(), c);
- timer.schedule(new TimerTask() {
- public void run() {
- c.timeout();
- }
- }, timeout);
+ System.out.println(timeout);
+ CallbackRegistry.getInstance().registerCallback(c.getID(), c,
timeout);
return c.getCoordinationContext();
}
@@ -101,10 +91,8 @@
CreateCoordinationContextType parameters) throws
RemoteException {
String t = parameters.getCoordinationType().toString();
Expires ex = parameters.getExpires();
- long timeout;
- if (ex == null)
- timeout = DEFAULT_TIMEOUT_MILLIS;
- else
+ long timeout = 0;
+ if (ex != null)
timeout = ex.get_value().longValue() * 1000;
CoordinationContext ctx;
try {
Modified:
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/Coordinator.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/Coordinator.java?rev=360231&r1=360230&r2=360231&view=diff
==============================================================================
---
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/Coordinator.java
(original)
+++
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/Coordinator.java
Fri Dec 30 19:57:37 2005
@@ -4,16 +4,15 @@
*/
package org.apache.ws.transaction.coordinator;
+import org.apache.ws.transaction.utility.Callback;
import org.apache.ws.transaction.wscoor.RegistrationPortTypeRPC;
/**
* @author Dasarath Weeratunge
*
*/
-public interface Coordinator extends RegistrationPortTypeRPC {
+public interface Coordinator extends RegistrationPortTypeRPC, Callback {
String getID();
CoordinationContext getCoordinationContext();
-
- void timeout();
}
Modified:
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/ParticipantService.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/ParticipantService.java?rev=360231&r1=360230&r2=360231&view=diff
==============================================================================
---
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/ParticipantService.java
(original)
+++
webservices/kandula/branches/Kandula_1/src/java/org/apache/ws/transaction/coordinator/ParticipantService.java
Fri Dec 30 19:57:37 2005
@@ -9,10 +9,10 @@
import org.apache.axis.message.addressing.EndpointReference;
import org.apache.axis.message.addressing.PortType;
import org.apache.axis.message.addressing.ReferencePropertiesType;
+import org.apache.ws.transaction.coordinator.at.BasicParticipant;
+import org.apache.ws.transaction.utility.Callback;
import org.apache.ws.transaction.utility.CallbackRegistry;
import org.apache.ws.transaction.utility.EndpointReferenceFactory;
-import org.apache.ws.transaction.wsat.CompletionInitiatorPortType;
-import org.apache.ws.transaction.wsat.ParticipantPortType;
/**
* @author Dasarath Weeratunge
@@ -35,26 +35,27 @@
return instance;
}
- public EndpointReference getCompletionInitiatorService(
- CompletionInitiatorPortType callback) {
+ public EndpointReference getCompletionInitiatorService(Callback
callback,
+ long timeout) {
String urn = "uuid" + UUIDGenFactory.getUUIDGen().nextUUID();
- CallbackRegistry.getInstance().registerCallback(urn, callback);
+ CallbackRegistry.getInstance().registerCallback(urn, callback,
timeout);
ReferencePropertiesType r = new ReferencePropertiesType();
r.add(new MessageElement(CallbackRegistry.CALLBACK_REF, urn));
return
EndpointReferenceFactory.getInstance().getEndpointReference(
COMPLETION_INITIATOR_SERVICE, r);
}
- public EndpointReference getParticipantService(ParticipantPortType
callback) {
+ public EndpointReference getParticipantService(
+ final BasicParticipant callback, long timeout) {
String urn = "uuid" + UUIDGenFactory.getUUIDGen().nextUUID();
- CallbackRegistry.getInstance().registerCallback(urn, callback);
+ CallbackRegistry.getInstance().registerCallback(urn, callback,
timeout);
ReferencePropertiesType r = new ReferencePropertiesType();
r.add(new MessageElement(CallbackRegistry.CALLBACK_REF, urn));
return
EndpointReferenceFactory.getInstance().getEndpointReference(
PARTICIPANT_SERVICE, r);
}
- public void forget(Object callback) {
+ private void forget(Object callback) {
CallbackRegistry.getInstance().remove(callback);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
