updated to work with Axis2 latest
Fixed integration/CreateCoordinationContextTest.java test to work in the Maven build
diff --git a/test/org/apache/kandula/context/ActivityContextTest.java b/test/org/apache/kandula/context/ActivityContextTest.java
index c4a04a1..6c24def 100644
--- a/test/org/apache/kandula/context/ActivityContextTest.java
+++ b/test/org/apache/kandula/context/ActivityContextTest.java
@@ -23,28 +23,28 @@
*/
public class ActivityContextTest extends TestCase {
- public void testGetActivityID() {
- //TODO Implement getActivityID().
- }
+ public void testGetActivityID() {
+ //TODO Implement getActivityID().
+ }
- public void testAddParticipant() {
- //TODO Implement addParticipant().
- }
+ public void testAddParticipant() {
+ //TODO Implement addParticipant().
+ }
- public void testGetStatus() {
- //TODO Implement getStatus().
- }
+ public void testGetStatus() {
+ //TODO Implement getStatus().
+ }
- public void testSetStatus() {
- //TODO Implement setStatus().
- }
+ public void testSetStatus() {
+ //TODO Implement setStatus().
+ }
- public void testLock() {
- //TODO Implement lock().
- }
+ public void testLock() {
+ //TODO Implement lock().
+ }
- public void testUnlock() {
- //TODO Implement unlock().
- }
+ public void testUnlock() {
+ //TODO Implement unlock().
+ }
}
\ No newline at end of file
diff --git a/test/org/apache/kandula/coordinator/CoordinatorImplTest.java b/test/org/apache/kandula/coordinator/CoordinatorImplTest.java
index 87d8822..a0f6d83 100644
--- a/test/org/apache/kandula/coordinator/CoordinatorImplTest.java
+++ b/test/org/apache/kandula/coordinator/CoordinatorImplTest.java
@@ -31,59 +31,59 @@
*/
public class CoordinatorImplTest extends TestCase {
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
+ /*
+ * @see TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ /*
+ * @see TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
- /*
- * Class under test for ActivityContext createCoordinationContext(String,
- * long)
- */
- public void testCreateCoordinationContextStringlong()
- throws AbstractKandulaException {
- Coordinator coordinator = new Coordinator();
- AbstractContext context = coordinator.createCoordinationContext(
- Constants.WS_AT, 3000);
- assertTrue(ATActivityContext.class.isInstance(context));
- assertNotNull(context.getCoordinationContext());
- assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE);
- }
+ /*
+ * Class under test for ActivityContext createCoordinationContext(String,
+ * long)
+ */
+ public void testCreateCoordinationContextStringlong()
+ throws AbstractKandulaException {
+ Coordinator coordinator = new Coordinator();
+ AbstractContext context = coordinator.createCoordinationContext(
+ Constants.WS_AT, 3000);
+ assertTrue(ATActivityContext.class.isInstance(context));
+ assertNotNull(context.getCoordinationContext());
+ assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE);
+ }
- /*
- * Class under test for ActivityContext
- * createCoordinationContext(CoordinationContext)
- */
- public void testCreateCoordinationContextCoordinationContext()
- throws AbstractKandulaException {
- Coordinator coordinator = new Coordinator();
- CoordinationContext coorContext = CoordinationContext.Factory
- .newContext("uuid:29919219jdk02102021", Constants.WS_AT,
- new EndpointReference(""));
- coorContext.setExpires(3000);
- // coorContext.setRegistrationService()
- AbstractContext context = coordinator
- .createCoordinationContext(coorContext);
- assertTrue(ATActivityContext.class.isInstance(context));
- assertNotNull(context.getCoordinationContext());
- assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE);
- assertEquals(context.getCoordinationContext().getCoordinationType(),
- coorContext.getCoordinationType());
- assertEquals(context.getCoordinationContext().getActivityID(),
- coorContext.getActivityID());
- }
+ /*
+ * Class under test for ActivityContext
+ * createCoordinationContext(CoordinationContext)
+ */
+ public void testCreateCoordinationContextCoordinationContext()
+ throws AbstractKandulaException {
+ Coordinator coordinator = new Coordinator();
+ CoordinationContext coorContext = CoordinationContext.Factory
+ .newContext("uuid:29919219jdk02102021", Constants.WS_AT,
+ new EndpointReference(""));
+ coorContext.setExpires(3000);
+ // coorContext.setRegistrationService()
+ AbstractContext context = coordinator
+ .createCoordinationContext(coorContext);
+ assertTrue(ATActivityContext.class.isInstance(context));
+ assertNotNull(context.getCoordinationContext());
+ assertTrue(context.getStatus() == Status.CoordinatorStatus.STATUS_ACTIVE);
+ assertEquals(context.getCoordinationContext().getCoordinationType(),
+ coorContext.getCoordinationType());
+ assertEquals(context.getCoordinationContext().getActivityID(),
+ coorContext.getActivityID());
+ }
- public void testRegisterParticipant() {
- //TODO Implement registerParticipant().
- }
+ public void testRegisterParticipant() {
+ //TODO Implement registerParticipant().
+ }
}
\ No newline at end of file
diff --git a/test/org/apache/kandula/coordinator/at/ATCoordinatorTest.java b/test/org/apache/kandula/coordinator/at/ATCoordinatorTest.java
index 12f54aa..9d6e514 100644
--- a/test/org/apache/kandula/coordinator/at/ATCoordinatorTest.java
+++ b/test/org/apache/kandula/coordinator/at/ATCoordinatorTest.java
@@ -23,28 +23,28 @@
*/
public class ATCoordinatorTest extends TestCase {
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
+ /*
+ * @see TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
- /**
- * Constructor for ATCoordinatorTest.
- *
- * @param arg0
- */
- public ATCoordinatorTest(String arg0) {
- super(arg0);
- }
+ /**
+ * Constructor for ATCoordinatorTest.
+ *
+ * @param arg0
+ */
+ public ATCoordinatorTest(String arg0) {
+ super(arg0);
+ }
- public void testCommitOperation() {
- //TODO Implement commitOperation().
- }
+ public void testCommitOperation() {
+ //TODO Implement commitOperation().
+ }
- public void testRollbackOperation() {
- //TODO Implement rollbackOperation().
- }
+ public void testRollbackOperation() {
+ //TODO Implement rollbackOperation().
+ }
}
\ No newline at end of file
diff --git a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
index 9ccc090..ef3f44f 100644
--- a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
+++ b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
@@ -34,63 +34,73 @@
public class CreateCoordinationContextTest extends TestCase {
- private String repository = "test-resources/testing-repository";
+ private String repository = "target/testing-repository";
- private SimpleHTTPServer server;
+ private SimpleHTTPServer server;
- private boolean finish = false;
+ private boolean finish = false;
- public CreateCoordinationContextTest() {
- super(CreateCoordinationContextTest.class.getName());
- }
+ public CreateCoordinationContextTest() {
+ super(CreateCoordinationContextTest.class.getName());
+ }
- public CreateCoordinationContextTest(String testName) {
- super(testName);
- }
+ public CreateCoordinationContextTest(String testName) {
+ super(testName);
+ }
- protected void setUp() throws Exception {
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- File file = new File(repository);
- if (!file.exists()) {
- throw new Exception("repository directory "
- + file.getAbsolutePath() + " does not exists");
- }
- ConfigurationContext er = erfac.buildConfigurationContext(file
- .getAbsolutePath());
+ protected void setUp() throws Exception {
+ ConfigurationContextFactory erfac = new ConfigurationContextFactory();
+ File file = new File(repository);
+ File configFile = new File(repository + "/axis2.xml");
+ if (!file.exists()) {
+ throw new Exception("repository directory "
+ + file.getAbsolutePath() + " does not exists");
+ }
+ ConfigurationContext er = erfac
+ .createConfigurationContextFromFileSystem(file
+ .getAbsolutePath(), configFile.getAbsolutePath());
- server = new SimpleHTTPServer(er, 8081);
+ server = new SimpleHTTPServer(er, 8081);
- try {
- server.start();
- System.out.print("Server started on port " + 8081 + ".....");
- } finally {
+ try {
+ server.start();
+ System.out.print("Server started on port " + 8081 + ".....");
+ } finally {
- }
+ }
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e1) {
- throw new AxisFault("Thread interuptted", e1);
- }
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e1) {
+ throw new AxisFault("Thread interuptted", e1);
+ }
- }
+ }
- protected void tearDown() throws Exception {
- server.stop();
- }
+ protected void tearDown() throws Exception {
+ server.stop();
+ }
- public void testEchoXMLSync() throws Exception {
- TransactionManager tm = new TransactionManager(
- Constants.WS_AT,
- new EndpointReference(
- "http://localhost:8082/axis2/services/ActivationCoordinator"));
+ public void testEchoXMLSync() throws Exception {
+ TransactionManager tm = new TransactionManager(
+ Constants.WS_AT,
+ new EndpointReference(
+ "http://localhost:8082/axis2/services/ActivationCoordinator"));
- tm.begin();
- KandulaDemoServiceStub stub = new KandulaDemoServiceStub("test-resources/client-repo",new EndpointReference(
- "http://localhost:8082/axis2/services/KandulaDemoService"));
- stub.creditOperation();
- tm.commit();
- Thread.sleep(3000);
-
- }
+ tm
+ .begin("D:/Dev/kandula_svn/repo",
+ "D:/Dev/kandula_svn/repo/axis2.xml");
+ //Thread.sleep(10000);
+ KandulaDemoServiceStub stub = new KandulaDemoServiceStub(
+ "D:/Dev/kandula_svn/repo",
+ new EndpointReference(
+ "http://localhost:8082/axis2/services/KandulaDemoService"));
+ stub.creditOperation();
+// try{
+ tm.commit();
+// }catch (Exception e)
+// {
+// e.printStackTrace();
+// }
+ }
}
\ No newline at end of file
diff --git a/test/org/apache/kandula/integration/DummyResource.java b/test/org/apache/kandula/integration/DummyResource.java
index 8c2ada4..315b96a 100644
--- a/test/org/apache/kandula/integration/DummyResource.java
+++ b/test/org/apache/kandula/integration/DummyResource.java
@@ -25,32 +25,30 @@
*/
public class DummyResource implements KandulaResource {
- /**
- *
- */
- public DummyResource() {
- super();
- // TODO Auto-generated constructor stub
- }
+ /**
+ *
+ */
+ public DummyResource() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+ public void commit() {
+ System.out.println("Commited");
- public void commit() {
- System.out.println("Commited");
+ }
- }
+ public void rollback() {
+ System.out.println("rollback");
- public void rollback() {
- System.out.println("rollback");
+ }
- }
+ public Vote prepare() {
+ return Vote.PREPARED;
+ }
- public Vote prepare() {
- return Vote.ABORT;
- }
+ public String getProtocol() {
+ return Constants.WS_AT_DURABLE2PC;
+ }
-
- public String getProtocol() {
- return Constants.WS_AT_DURABLE2PC;
- }
-
-}
+}
\ No newline at end of file
diff --git a/test/org/apache/kandula/integration/KandulaDemoService.java b/test/org/apache/kandula/integration/KandulaDemoService.java
index 6189310..e5f3797 100644
--- a/test/org/apache/kandula/integration/KandulaDemoService.java
+++ b/test/org/apache/kandula/integration/KandulaDemoService.java
@@ -23,14 +23,14 @@
*/
public class KandulaDemoService {
- /**
- *
- */
- public KandulaDemoService() {
+ /**
+ *
+ */
+ public KandulaDemoService() {
- }
- public OMElement creditOperation(OMElement element)
- {
- return null;
- }
-}
+ }
+
+ public OMElement creditOperation(OMElement element) {
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/test/org/apache/kandula/integration/KandulaDemoServiceStub.java b/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
index 88cdd2d..be05e04 100644
--- a/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
+++ b/test/org/apache/kandula/integration/KandulaDemoServiceStub.java
@@ -20,81 +20,98 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.MessageSender;
+import org.apache.axis2.client.OperationClient;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.OutInAxisOperation;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.OutOnlyAxisOperation;
import org.apache.axis2.om.OMAbstractFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
*/
-public class KandulaDemoServiceStub extends
- org.apache.axis2.client.Stub {
+public class KandulaDemoServiceStub extends org.apache.axis2.client.Stub {
- public static final String AXIS2_HOME = ".";
+ public static final String AXIS2_HOME = ".";
- protected static org.apache.axis2.description.AxisOperation[] operations;
+ // private AxisService service;
+ private ConfigurationContext configurationContext;
- static {
+ private ServiceContext serviceContext;
- //creating the Service
- _service = new AxisService(
- new javax.xml.namespace.QName( "KandulaDemoService"));
+ private EndpointReference toEPR;
- //creating the operations
- AxisOperation operationDesc;
- operations = new org.apache.axis2.description.AxisOperation[1];
+ private static org.apache.axis2.description.AxisOperation[] operations;
- operationDesc = new OutInAxisOperation();
- operationDesc.setName(new javax.xml.namespace.QName("creditOperation"));
- operations[0] = operationDesc;
- _service.addOperation(operationDesc);
+ static {
- }
+ //creating the Service
+ _service = new AxisService("KandulaDemoService");
- /**
- * Constructor
- */
- public KandulaDemoServiceStub(String axis2Home,
- EndpointReference targetEndpoint) throws java.lang.Exception {
- this.toEPR = targetEndpoint;
- //creating the configuration
- _configurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
- .buildClientConfigurationContext(axis2Home);
+ //creating the operations
+ AxisOperation operationDesc;
+ operations = new org.apache.axis2.description.AxisOperation[1];
- _configurationContext.getAxisConfiguration().addService(_service);
- _serviceContext = _service.getParent().getServiceGroupContext(
- _configurationContext).getServiceContext(
- _service.getName().getLocalPart());
+ operationDesc = new OutOnlyAxisOperation();
+ operationDesc.setName(new javax.xml.namespace.QName("creditOperation"));
+ operations[0] = operationDesc;
+ _service.addOperation(operationDesc);
- }
+ }
- public void creditOperation() throws IOException {
+ /**
+ * Constructor
+ */
+ public KandulaDemoServiceStub(String axis2Home,
+ EndpointReference targetEndpoint) throws java.lang.Exception {
+ this.toEPR = targetEndpoint;
+ //creating the configuration
+ configurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
+ .createConfigurationContextFromFileSystem(axis2Home, axis2Home
+ + "/axis2.xml");
+ // configurationContext.getAxisConfiguration().engageModule(new
+ // QName("addressing"));
+ configurationContext.getAxisConfiguration().addService(_service);
+ ServiceGroupContext sgc = new ServiceGroupContext(
+ this.configurationContext, (AxisServiceGroup) this._service
+ .getParent());
+ this.serviceContext = new ServiceContext(_service, sgc);
- EndpointReference replyToEpr;
+ }
- org.apache.axis2.context.MessageContext messageContext = getMessageContext();
- messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
- AddressingConstants.Submission.WSA_NAMESPACE);
- org.apache.axis2.soap.SOAPEnvelope env = createSOAPEnvelope();
- messageContext.setEnvelope(env);
+ public void creditOperation() throws IOException {
- MessageSender messageSender = new MessageSender(_serviceContext);
- messageSender.setWsaAction("creditOperation");
- messageSender.setTo(this.toEPR);
- messageSender
- .setSenderTransport(org.apache.axis2.Constants.TRANSPORT_HTTP);
- messageSender.send(operations[0], messageContext);
+ EndpointReference replyToEpr;
+ Options options = new Options();
+ MessageContext messageContext = new MessageContext();
+ messageContext.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,
+ AddressingConstants.Submission.WSA_NAMESPACE);
+ org.apache.axis2.soap.SOAPEnvelope env = createSOAPEnvelope();
+ messageContext.setEnvelope(env);
- }
+ options.setAction("creditOperation");
+ options.setTo(this.toEPR);
+ // messageSender
+ // .setSenderTransport(org.apache.axis2.Constants.TRANSPORT_HTTP);
+ OperationClient client = operations[0].createClient(serviceContext,
+ options);
+ client.addMessageContext(messageContext);
+ client.execute(true);
- private org.apache.axis2.soap.SOAPEnvelope createSOAPEnvelope() {
- org.apache.axis2.soap.SOAPEnvelope env = super.createEnvelope();
- org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
- .getSOAP12Factory();
- return env;
- }
+ }
+
+ private org.apache.axis2.soap.SOAPEnvelope createSOAPEnvelope() {
+
+ org.apache.axis2.soap.SOAPFactory factory = OMAbstractFactory
+ .getSOAP12Factory();
+ org.apache.axis2.soap.SOAPEnvelope env = factory.getDefaultEnvelope();
+ return env;
+ }
}
\ No newline at end of file
