Author: thilina
Date: Sun Nov 20 14:09:12 2005
New Revision: 345784
URL: http://svn.apache.org/viewcvs?rev=345784&view=rev
Log:
Changes clientapi->client
(Axis2 package name alteration)
Upadates project.xml to use axis2-0.93-dev jars
Excluded protocol messages when engaging TransactionOutHandler.java
Modified:
webservices/kandula/trunk/java/project.xml
webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java
webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaUtils.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.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/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
webservices/kandula/trunk/java/test/org/apache/kandula/integration/DummyResource.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=345784&r1=345783&r2=345784&view=diff
==============================================================================
--- webservices/kandula/trunk/java/project.xml (original)
+++ webservices/kandula/trunk/java/project.xml Sun Nov 20 14:09:12 2005
@@ -113,31 +113,31 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-core</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-xml</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-wsdl</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-addressing</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -21,25 +21,31 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.soap.SOAPHeader;
+import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.coordination.CoordinationContext;
import org.apache.kandula.faults.AbstractKandulaException;
public class TransactionOutHandler extends AbstractHandler {
-
- public void invoke(MessageContext msgContext) throws AxisFault {
-
- AbstractContext context;
- try {
- context = TransactionManager.getTransaction();
- MessageInformationHeaders messageInformationHeaders = msgContext
- .getMessageInformationHeaders();
- SOAPHeader soapHeader = msgContext.getEnvelope().getHeader();
- CoordinationContext coorContext = context.getCoordinationContext();
- soapHeader.addChild(coorContext.toOM());
- } catch (AbstractKandulaException e) {
- throw new AxisFault(e);
- }
- }
+
+ public void invoke(MessageContext msgContext) throws AxisFault {
+
+ AbstractContext context;
+ try {
+ String wsaAction = msgContext.getWSAAction();
+ if ((wsaAction !=
Constants.WS_COOR_CREATE_COORDINATIONCONTEXT)
+ && (wsaAction !=
Constants.WS_COOR_REGISTER)) {
+ context = TransactionManager.getTransaction();
+ MessageInformationHeaders
messageInformationHeaders = msgContext
+ .getMessageInformationHeaders();
+ SOAPHeader soapHeader =
msgContext.getEnvelope().getHeader();
+ CoordinationContext coorContext = context
+ .getCoordinationContext();
+ soapHeader.addChild(coorContext.toOM());
+ }
+ } catch (AbstractKandulaException e) {
+ throw new AxisFault(e);
+ }
+ }
}
Modified:
webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaUtils.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaUtils.java?rev=345784&r1=345783&r2=345784&view=diff
==============================================================================
---
webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaUtils.java
(original)
+++
webservices/kandula/trunk/java/src/org/apache/kandula/utility/KandulaUtils.java
Sun Nov 20 14:09:12 2005
@@ -42,7 +42,7 @@
SOAPFactory factory) {
OMNamespace wsAddressing = factory.createOMNamespace(
AddressingConstants.Submission.WSA_NAMESPACE,
- AddressingConstants.WSA_DEFAULT_PRFIX);
+ AddressingConstants.WSA_DEFAULT_PREFIX);
OMElement addressElement = factory.createOMElement("Address",
wsAddressing);
addressElement.setText(epr.getAddress());
Modified:
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/AbstractATNotifierStub.java?rev=345784&r1=345783&r2=345784&view=diff
==============================================================================
---
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
(original)
+++
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/AbstractATNotifierStub.java
Sun Nov 20 14:09:12 2005
@@ -20,8 +20,8 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.MessageSender;
-import org.apache.axis2.clientapi.Stub;
+import org.apache.axis2.client.MessageSender;
+import org.apache.axis2.client.Stub;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -20,11 +20,10 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
-import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.coordinator.at.ATCoordinator;
import org.apache.kandula.faults.AbstractKandulaException;
+import org.apache.kandula.storage.StorageFactory;
/**
* @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a>
*/
Modified:
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java?rev=345784&r1=345783&r2=345784&view=diff
==============================================================================
---
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
(original)
+++
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
Sun Nov 20 14:09:12 2005
@@ -20,12 +20,11 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.om.OMElement;
import org.apache.kandula.Constants;
-import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.context.AbstractContext;
-import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.coordinator.at.ATCoordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.participant.Vote;
+import org.apache.kandula.storage.StorageFactory;
/**
* @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a>
*/
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -22,7 +22,6 @@
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.faults.AbstractKandulaException;
-import org.apache.kandula.faults.InvalidStateException;
import org.apache.kandula.participant.ParticipantTransactionManager;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.storage.Store;
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -23,7 +23,7 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AnyContentType;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.MessageSender;
+import org.apache.axis2.client.MessageSender;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
@@ -42,7 +42,7 @@
*/
public class ActivationCoordinatorPortTypeRawXMLStub extends
- org.apache.axis2.clientapi.Stub {
+ org.apache.axis2.client.Stub {
public static final String AXIS2_HOME = ".";
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -23,7 +23,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AnyContentType;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.MessageSender;
+import org.apache.axis2.client.MessageSender;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOnlyAxisOperation;
@@ -43,7 +43,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]"> Thilina Gunarathne </a>
*/
public class RegistrationCoordinatorPortTypeRawXMLStub extends
- org.apache.axis2.clientapi.Stub {
+ org.apache.axis2.client.Stub {
public static final String AXIS2_HOME = ".";
protected static org.apache.axis2.description.AxisOperation[] _operations;
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -16,8 +16,6 @@
*/
package org.apache.kandula.wscoor;
-import java.util.ArrayList;
-
import javax.xml.namespace.QName;
import org.apache.axis2.AxisFault;
@@ -28,9 +26,9 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.kandula.Constants;
-import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.faults.AbstractKandulaException;
+import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.utility.KandulaUtils;
/**
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -30,7 +30,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.kandula.Constants;
-import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.initiator.TransactionManager;
public class CreateCoordinationContextTest extends TestCase {
@@ -62,7 +61,7 @@
server = new SimpleHTTPServer(er, 8081);
try {
- server.start();
+ server.start();
System.out.print("Server started on port " + 8081 + ".....");
} finally {
@@ -84,11 +83,11 @@
TransactionManager tm = new TransactionManager(
Constants.WS_AT,
new EndpointReference(
-
"http://localhost:8082/axis/services/ActivationCoordinator";));
+
"http://localhost:8082/axis2/services/ActivationCoordinator";));
tm.begin();
KandulaDemoServiceStub stub = new
KandulaDemoServiceStub("test-resources/client-repo",new EndpointReference(
- "http://localhost:8082/axis/services/KandulaDemoService";));
+ "http://localhost:8082/axis2/services/KandulaDemoService";));
stub.creditOperation();
tm.commit();
Thread.sleep(3000);
Modified:
webservices/kandula/trunk/java/test/org/apache/kandula/integration/DummyResource.java
URL:
http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test/org/apache/kandula/integration/DummyResource.java?rev=345784&r1=345783&r2=345784&view=diff
==============================================================================
---
webservices/kandula/trunk/java/test/org/apache/kandula/integration/DummyResource.java
(original)
+++
webservices/kandula/trunk/java/test/org/apache/kandula/integration/DummyResource.java
Sun Nov 20 14:09:12 2005
@@ -45,7 +45,7 @@
}
public Vote prepare() {
- return Vote.PREPARED;
+ return Vote.ABORT;
}
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=345784&r1=345783&r2=345784&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
Sun Nov 20 14:09:12 2005
@@ -20,7 +20,7 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.MessageSender;
+import org.apache.axis2.client.MessageSender;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
@@ -31,7 +31,7 @@
*/
public class KandulaDemoServiceStub extends
- org.apache.axis2.clientapi.Stub {
+ org.apache.axis2.client.Stub {
public static final String AXIS2_HOME = ".";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
