Modified: webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis1Store.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis1Store.java?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis1Store.java (original) +++ webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis1Store.java Wed Sep 21 04:55:49 2005 @@ -16,7 +16,6 @@ */ package org.apache.kandula.storage; -import org.apache.kandula.context.ActivityContext; /** * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> @@ -26,7 +25,7 @@ /* (non-Javadoc) * @see org.apache.kandula.storage.Store#putContext(java.lang.String, org.apache.kandula.context.coordination.CoordinationContext) */ - public void putContext(Object id, ActivityContext context) { + public void put(Object id, Object context) { // TODO Auto-generated method stub } @@ -34,7 +33,7 @@ /* (non-Javadoc) * @see org.apache.kandula.storage.Store#getContext(java.lang.String) */ - public ActivityContext getContext(Object id) { + public Object get(Object id) { return null; } @@ -42,7 +41,7 @@ /* (non-Javadoc) * @see org.apache.kandula.storage.Store#forgetContext(java.lang.String) */ - public void forgetContext(Object id) { + public void forget(Object id) { // TODO Auto-generated method stub }
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis2Store.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis2Store.java?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis2Store.java (original) +++ webservices/kandula/trunk/java/src/org/apache/kandula/storage/Axis2Store.java Wed Sep 21 04:55:49 2005 @@ -16,7 +16,6 @@ */ package org.apache.kandula.storage; -import org.apache.kandula.context.ActivityContext; /** * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> @@ -26,7 +25,7 @@ /* (non-Javadoc) * @see org.apache.kandula.storage.Store#putContext(java.lang.String, org.apache.kandula.context.coordination.CoordinationContext) */ - public void putContext(Object id, ActivityContext context) { + public void put(Object id, Object context) { // TODO Auto-generated method stub } @@ -34,12 +33,12 @@ /* (non-Javadoc) * @see org.apache.kandula.storage.Store#getContext(java.lang.String) */ - public ActivityContext getContext(Object id) { + public Object get(Object id) { return null; } - public void forgetContext(Object id) { + public void forget(Object id) { } } Modified: webservices/kandula/trunk/java/src/org/apache/kandula/storage/SimpleStore.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/storage/SimpleStore.java?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/storage/SimpleStore.java (original) +++ webservices/kandula/trunk/java/src/org/apache/kandula/storage/SimpleStore.java Wed Sep 21 04:55:49 2005 @@ -16,7 +16,7 @@ */ package org.apache.kandula.storage; -import org.apache.kandula.context.ActivityContext; +import org.apache.kandula.context.AbstractContext; import java.util.HashMap; @@ -34,21 +34,21 @@ contextMap = new HashMap(); } - public void putContext(Object id, ActivityContext context) { + public void put(Object id, Object context) { contextMap.put(id, context); } /* (non-Javadoc) * @see org.apache.kandula.storage.Store#getContext(java.lang.String) */ - public ActivityContext getContext(Object id) { - return (ActivityContext) contextMap.get(id); + public Object get(Object id) { + return (AbstractContext) contextMap.get(id); } /* (non-Javadoc) * @see org.apache.kandula.storage.Store#forgetContext(java.lang.String) */ - public void forgetContext(Object id) { + public void forget(Object id) { contextMap.remove(id); } Modified: webservices/kandula/trunk/java/src/org/apache/kandula/storage/Store.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/storage/Store.java?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/storage/Store.java (original) +++ webservices/kandula/trunk/java/src/org/apache/kandula/storage/Store.java Wed Sep 21 04:55:49 2005 @@ -16,15 +16,14 @@ */ package org.apache.kandula.storage; -import org.apache.kandula.context.ActivityContext; /** * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> */ public interface Store { - void putContext(Object id, ActivityContext context); + void put(Object id, Object context); - ActivityContext getContext(Object id); + Object get(Object id); - void forgetContext(Object id); + void forget(Object id); } 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=290684&r1=290683&r2=290684&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 Wed Sep 21 04:55:49 2005 @@ -107,7 +107,7 @@ } public String getHost() throws UnknownHostException { - return "http://"; + InetAddress.getLocalHost().getHostAddress() + ":" + SERVER_PORT + return "http://"; + InetAddress.getLocalHost().getHostAddress() + ":" + 5060 + "/axis2/services/"; } } Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java (original) +++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java Wed Sep 21 04:55:49 2005 @@ -1,11 +1,12 @@ package org.apache.kandula.wscoor; +import javax.xml.namespace.QName; + +import org.apache.axis2.AxisFault; import org.apache.axis2.om.OMElement; -import org.apache.kandula.KandulaException; -import org.apache.kandula.context.ActivityContext; +import org.apache.kandula.context.AbstractContext; import org.apache.kandula.coordinator.Coordinator; - -import javax.xml.namespace.QName; +import org.apache.kandula.faults.AbstractKandulaException; /** * Auto generated java skeleton for the service by the Axis code generator @@ -15,26 +16,21 @@ /** * Auto generated method signature - * + * * @param requestElement - * @throws KandulaException + * @throws AbstractKandulaException */ - public OMElement CreateCoordinationContextOperation( - OMElement requestElement) - throws KandulaException { - ActivityContext context; - Coordinator coordinator = new Coordinator(); - -// ActivityContext context; -// Coordinator coordinator = new Coordinator(); -// if (requestDoc.getCreateCoordinationContext().getCurrentContext() != null) { -// CoordinationContext coorContext = CoordinationContext.Factory.newInstance(requestDoc -// .getCreateCoordinationContext().getCurrentContext()); -// context = coordinator.createCoordinationContext(coorContext); -// }else -// { - String coordinationType = requestElement.getFirstChildWithName(new QName("CoordinationType")).getText(); - OMElement expiresElement = requestElement.getFirstChildWithName(new QName("Expires")); + public OMElement CreateCoordinationContextOperation(OMElement requestElement) + throws AxisFault { + AbstractContext context; + + /* + * Extracting data from the incoming message + */ + String coordinationType = requestElement.getFirstChildWithName( + new QName("CoordinationType")).getText(); + OMElement expiresElement = requestElement + .getFirstChildWithName(new QName("Expires")); String expires = null; long expiresL = 0; if (expiresElement != null) { @@ -43,38 +39,20 @@ expiresL = Long.parseLong(expires); } } - context = coordinator.createCoordinationContext(coordinationType, expiresL); - return context.getCoordinationContext().toOM(); - - // context(coordinationType, expiresL); - // } -// CreateCoordinationContextResponseDocument responseDoc = CreateCoordinationContextResponseDocument.Factory -// .newInstance(); -// CreateCoordinationContextResponseType responseType = CreateCoordinationContextResponseType.Factory -// .newInstance(); -// responseType.setCoordinationContext((CoordinationContextType)context.getCoordinationContext().getCoordinationContextType()); -// responseDoc.setCreateCoordinationContextResponse(responseType); - // return new OMElementImpl("Thilina",new OMNamespaceImpl("pre","http://www.thilina.org";)); - -// if (requestDoc.getCreateCoordinationContext().getCurrentContext() != null) { -// CoordinationContext coorContext = CoordinationContext.Factory.newInstance(requestDoc -// .getCreateCoordinationContext().getCurrentContext()); -// context = coordinator.createCoordinationContext(coorContext); -// }else -// { -// context = coordinator.createCoordinationContext(requestDoc -// .getCreateCoordinationContext().getCoordinationType(), Long -// .parseLong(requestDoc.getCreateCoordinationContext() -// .getExpires().getId())); -// } -// CreateCoordinationContextResponseDocument responseDoc = CreateCoordinationContextResponseDocument.Factory -// .newInstance(); -// CreateCoordinationContextResponseType responseType = CreateCoordinationContextResponseType.Factory -// .newInstance(); -// responseType.setCoordinationContext((CoordinationContextType)context.getCoordinationContext().getCoordinationContextType()); -// responseDoc.setCreateCoordinationContextResponse(responseType); -// return responseDoc; + /* + * Creating the Coordination Context + */ + try { + Coordinator coordinator = new Coordinator(); + context = coordinator.createCoordinationContext(coordinationType, + expiresL); + return context.getCoordinationContext().toOM(); + } catch (AbstractKandulaException e) { + AxisFault fault = new AxisFault(e); + fault.setFaultCode(e.getFaultCode()); + throw fault; + } } 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=290684&r1=290683&r2=290684&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 Wed Sep 21 04:55:49 2005 @@ -2,7 +2,7 @@ import org.apache.axis2.context.MessageContext; import org.apache.axis2.om.OMElement; -import org.apache.kandula.context.ActivityContext; +import org.apache.kandula.context.AbstractContext; import org.apache.kandula.initiator.TransactionManager; import org.apache.kandula.storage.StorageFactory; import org.apache.kandula.context.coordination.CoordinationContext; @@ -37,12 +37,10 @@ } public OMElement CreateCoordinationContextOperation(OMElement requestElement) { -// OMElement coordinationContextElement = requestElement -// .getFirstChildWithName(new QName("CoordinationContext")); if ("CoordinationContext".equals(requestElement.getLocalName())) { msgContext.getMessageInformationHeaders().getReferenceParameters(); - CoordinationContext coordinationContext = CoordinationContext.Factory.newInstance(requestElement); - ActivityContext context = StorageFactory.getInstance().getStore().getContext(TransactionManager.tempID); + CoordinationContext coordinationContext = CoordinationContext.Factory.newContext(requestElement); + AbstractContext context = (AbstractContext)StorageFactory.getInstance().getStore().get(TransactionManager.tempID); context.setCoordinationContext(coordinationContext); } return null; Added: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java?rev=290684&view=auto ============================================================================== --- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java (added) +++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java Wed Sep 21 04:55:49 2005 @@ -0,0 +1,77 @@ +/* + * 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.wscoor; + +import org.apache.axis2.AxisFault; +import org.apache.axis2.engine.DependencyManager; +import org.apache.axis2.om.OMElement; + +/** + * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> + */ +public class RegistrationPortTypeRawXMLAsyncMessageReceiver extends + org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver { + + public void invokeBusinessLogic( + org.apache.axis2.context.MessageContext msgContext, + org.apache.axis2.context.MessageContext newMsgContext/*, + ServerCallback callback*/) throws org.apache.axis2.AxisFault { + + try { + + // get the implementation class for the Web Service + Object obj = getTheImplementationObject(msgContext); + + //Inject the Message Context if it is asked for + DependencyManager.configureBusinessLogicProvider(obj, msgContext, newMsgContext); + + RegistrationPortTypeRawXMLSkeleton skel = (RegistrationPortTypeRawXMLSkeleton) obj; + //Out Envelop + org.apache.axis2.soap.SOAPEnvelope envelope = null; + //Find the operation that has been set by the Dispatch phase. + org.apache.axis2.description.OperationDescription op = msgContext + .getOperationContext().getAxisOperation(); + + String methodName; + if (op.getName() != null + & (methodName = op.getName().getLocalPart()) != null) { + if (methodName.equals("RegisterOperation")) { + OMElement response = null; + + //doc style + response = skel + .RegisterOperation((org.apache.axis2.om.OMElement) msgContext + .getEnvelope().getBody().getFirstChild() + .detach()); + + //Create a default envelop + envelope = getSOAPFactory().getDefaultEnvelope(); + //Create a Omelement of the result if a result exist + + envelope.getBody().setFirstChild(response); + } + newMsgContext.setEnvelope(envelope); + newMsgContext.setSoapAction("RegisterOperation"); + // callback.handleResult(newMsgContext); + } + } catch (Exception e) { + throw AxisFault.makeFault(e); + } + + } + +} \ No newline at end of file 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=290684&r1=290683&r2=290684&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 Wed Sep 21 04:55:49 2005 @@ -16,6 +16,12 @@ */ package org.apache.kandula.wscoor; +import java.util.ArrayList; +import java.util.Iterator; + +import javax.xml.namespace.QName; + +import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.AnyContentType; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.MessageContext; @@ -23,14 +29,10 @@ import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMNamespace; import org.apache.axis2.soap.SOAPFactory; -import org.apache.kandula.KandulaException; import org.apache.kandula.coordinator.Coordinator; +import org.apache.kandula.faults.AbstractKandulaException; import org.apache.kandula.utility.KandulaUtils; -import javax.xml.namespace.QName; -import java.util.ArrayList; -import java.util.Iterator; - /** * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> */ @@ -43,15 +45,22 @@ } public OMElement RegisterOperation(OMElement request) - throws KandulaException { + throws AxisFault { - String protocolIdentifier = request.getFirstChildWithName( + String protocolIdentifier; + EndpointReference participantEPR; + String activityId; + + /* + * Extracting data from the received message + */ + protocolIdentifier = request.getFirstChildWithName( new QName("ProtocolIdentifier")).getText(); OMElement participantEPRElement = request .getFirstChildWithName(new QName("ParticipantProtocolService")); - EndpointReference participantEPR = new EndpointReference( - participantEPRElement.getFirstChildWithName( - new QName("Address")).getText()); + //Extracting the participant EPR + participantEPR = new EndpointReference(participantEPRElement + .getFirstChildWithName(new QName("Address")).getText()); AnyContentType referenceProperties = new AnyContentType(); OMElement referencePropertiesElement = participantEPRElement .getFirstChildWithName(new QName("ReferenceProperties")); @@ -66,14 +75,27 @@ //have to extract the reference parameter "id". Axis2 does not support ArrayList list = msgContext.getMessageInformationHeaders() .getReferenceParameters(); + //TODO :Have to use the Activity ID came with EPR as a reference property + activityId = Coordinator.ACTIVITY_ID; + /* + * Registering the participant for the activity for the given protocol + */ + try{ Coordinator coordinator = new Coordinator(); - EndpointReference epr = coordinator.registerParticipant( - Coordinator.ACTIVITY_ID, protocolIdentifier, participantEPR); - System.out.println("visited registration skeleton"); + EndpointReference epr = coordinator.registerParticipant(activityId, + protocolIdentifier, participantEPR); return toOM(epr); + } catch (AbstractKandulaException e) { + AxisFault fault = new AxisFault(e); + fault.setFaultCode(e.getFaultCode()); + throw fault; + } } + /** + * Serializes an EndpointRefrence to OM Nodes + */ private OMElement toOM(EndpointReference epr) { SOAPFactory factory = OMAbstractFactory.getSOAP12Factory(); OMNamespace wsCoor = factory.createOMNamespace( Modified: webservices/kandula/trunk/java/test-resources/testing-repository/services/RegistrationCoordinator.jar URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test-resources/testing-repository/services/RegistrationCoordinator.jar?rev=290684&r1=290683&r2=290684&view=diff ============================================================================== Binary files - no diff available. 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=290684&r1=290683&r2=290684&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 Wed Sep 21 04:55:49 2005 @@ -17,12 +17,14 @@ package org.apache.kandula.coordinator; import junit.framework.TestCase; + +import org.apache.axis2.addressing.EndpointReference; import org.apache.kandula.Constants; -import org.apache.kandula.KandulaException; import org.apache.kandula.Status; -import org.apache.kandula.context.ActivityContext; -import org.apache.kandula.context.coordination.CoordinationContext; +import org.apache.kandula.context.AbstractContext; import org.apache.kandula.context.at.ATActivityContext; +import org.apache.kandula.context.coordination.CoordinationContext; +import org.apache.kandula.faults.AbstractKandulaException; /** * @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a> @@ -46,9 +48,9 @@ /* * Class under test for ActivityContext createCoordinationContext(String, long) */ - public void testCreateCoordinationContextStringlong() throws KandulaException { + public void testCreateCoordinationContextStringlong() throws AbstractKandulaException { Coordinator coordinator = new Coordinator(); - ActivityContext context = coordinator.createCoordinationContext(Constants.WS_AT, 3000); + AbstractContext context = coordinator.createCoordinationContext(Constants.WS_AT, 3000); assertTrue(ATActivityContext.class.isInstance(context)); assertNotNull(context.getCoordinationContext()); assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE); @@ -57,14 +59,12 @@ /* * Class under test for ActivityContext createCoordinationContext(CoordinationContext) */ - public void testCreateCoordinationContextCoordinationContext() throws KandulaException { + public void testCreateCoordinationContextCoordinationContext() throws AbstractKandulaException { Coordinator coordinator = new Coordinator(); - CoordinationContext coorContext = CoordinationContext.Factory.newInstance(); - coorContext.setCoordinationType(Constants.WS_AT); + CoordinationContext coorContext = CoordinationContext.Factory.newContext("uuid:29919219jdk02102021",Constants.WS_AT,new EndpointReference("")); coorContext.setExpires(3000); - coorContext.setActivityID("uuid:29919219jdk02102021"); // coorContext.setRegistrationService() - ActivityContext context = coordinator.createCoordinationContext(coorContext); + AbstractContext context = coordinator.createCoordinationContext(coorContext); assertTrue(ATActivityContext.class.isInstance(context)); assertNotNull(context.getCoordinationContext()); assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE); 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=290684&r1=290683&r2=290684&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 Wed Sep 21 04:55:49 2005 @@ -85,7 +85,7 @@ public void testEchoXMLSync() throws Exception { - TransactionManager tm = new TransactionManager(Constants.WS_AT, new EndpointReference("http://localhost:8081/axis/services/ActivationCoordinator";)); + TransactionManager tm = new TransactionManager(Constants.WS_AT, new EndpointReference("http://localhost:8082/axis/services/ActivationCoordinator";)); //Thread.sleep(100000); tm.begin(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
