You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by th...@apache.org on 2006/05/07 07:48:16 UTC
svn commit: r400430 - in /webservices/kandula/trunk/java: ./ src/
src/org/apache/kandula/context/ src/org/apache/kandula/context/impl/
src/org/apache/kandula/initiator/ src/org/apache/kandula/participant/
src/org/apache/kandula/utility/ src/org/apache/...
Author: thilina
Date: Sat May 6 22:48:12 2006
New Revision: 400430
URL: http://svn.apache.org/viewcvs?rev=400430&view=rev
Log:
Fixing the code to be sync with Axis2 1.0 , Axiom 1.0
Modified:
webservices/kandula/trunk/java/project.xml
webservices/kandula/trunk/java/src/endpoints.conf
webservices/kandula/trunk/java/src/org/apache/kandula/context/CoordinationContext.java
webservices/kandula/trunk/java/src/org/apache/kandula/context/impl/SimpleCoordinationContext.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/wsat/AbstractATNotifierStub.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.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/wsat/twopc/ParticipantServiceListener.java
webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java
webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.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/RegistrationPortTypeRawXMLAsyncMessageReceiver.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/integration/CreateCoordinationContextTest.java
webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoService.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=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/project.xml (original)
+++ webservices/kandula/trunk/java/project.xml Sat May 6 22:48:12 2006
@@ -118,29 +118,12 @@
</dependency>
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <artifactId>axis2-kernel</artifactId>
+ <version>1.0</version>
</dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
- <version>0.95-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-addressing</artifactId>
- <version>0.95-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>0.95-SNAPSHOT</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
@@ -178,17 +161,18 @@
</dependency>
<dependency>
<groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <artifactId>stax-api</artifactId>
<version>1.0</version>
<properties>
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>ws-commons</groupId>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0</version>
</dependency>
+
<dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
@@ -223,25 +207,25 @@
</dependency>
<dependency>
<groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>SNAPSHOT</version>
+ <artifactId>axiom-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>1.0</version>
</dependency>
+
<dependency>
<groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>SNAPSHOT</version>
+ <artifactId>neethi</artifactId>
+ <version>1.0.1</version>
<properties>
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>SNAPSHOT</version>
-
- </dependency>
-
+
</dependencies>
<!-- ================================= -->
Modified: webservices/kandula/trunk/java/src/endpoints.conf
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/endpoints.conf?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/endpoints.conf (original)
+++ webservices/kandula/trunk/java/src/endpoints.conf Sat May 6 22:48:12 2006
@@ -1,10 +1,10 @@
host=127.0.0.1
-port=8082
-tcpmon_enable=true
+port=8081
+tcpmon_enable=false
COORDINATOR_REPOSITORY=target/testing-repository
COORDINATOR_AXIS2XML=target/testing-repository/axis2.xml
PARTICIPANT_REPOSITORY=target/testing-repository
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
+KANDULA_LISTENER_PORT=5050
\ No newline at end of file
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/context/CoordinationContext.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/context/CoordinationContext.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/context/CoordinationContext.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/context/CoordinationContext.java Sat May 6 22:48:12 2006
@@ -16,9 +16,9 @@
*/
package org.apache.kandula.context;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.kandula.context.impl.SimpleCoordinationContext;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/context/impl/SimpleCoordinationContext.java Sat May 6 22:48:12 2006
@@ -18,14 +18,14 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.kandula.Constants;
import org.apache.kandula.context.CoordinationContext;
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;
-import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.initiator;
+import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
@@ -23,7 +24,7 @@
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.CoordinationContext;
import org.apache.kandula.faults.AbstractKandulaException;
-import org.apache.ws.commons.soap.SOAPHeader;
+
public class TransactionOutHandler extends AbstractHandler {
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -20,6 +20,8 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
@@ -32,11 +34,10 @@
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.storage.Store;
-import org.apache.kandula.utility.KandulaConfiguration;
import org.apache.kandula.utility.EndpointReferenceFactory;
+import org.apache.kandula.utility.KandulaConfiguration;
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 {
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -28,15 +28,15 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
+import org.apache.axiom.soap.SOAPFactory;
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 <a href="mailto:thilina@apache.org"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -18,6 +18,11 @@
import java.io.IOException;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
@@ -34,11 +39,6 @@
import org.apache.kandula.Constants;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.faults.KandulaGeneralException;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAPEnvelope;
-import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,13 +16,13 @@
*/
package org.apache.kandula.wsat.completion;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
import org.apache.kandula.coordinator.at.ATCoordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java Sat May 6 22:48:12 2006
@@ -16,12 +16,12 @@
*/
package org.apache.kandula.wsat.completion;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
import org.apache.kandula.Status;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.storage.StorageFactory;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.wsat.completion;
+import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
@@ -30,6 +31,7 @@
import org.apache.kandula.Constants;
import org.apache.kandula.utility.KandulaListener;
+
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
*/
@@ -64,7 +66,7 @@
AxisService service = new AxisService(serviceName);
service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
- service.setFileName(className);
+ service.setFileName((new File(className)).toURL());
QName committedOperationName = new QName(Constants.WS_COOR,
"committedOperation");
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.wsat.twopc;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
@@ -23,7 +24,6 @@
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.participant.Vote;
import org.apache.kandula.storage.StorageFactory;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> 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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.wsat.twopc;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
@@ -24,7 +25,6 @@
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;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.wsat.twopc;
+import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
@@ -29,6 +30,7 @@
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.kandula.Constants;
import org.apache.kandula.utility.KandulaListener;
+import org.codehaus.jam.internal.elements.ParameterImpl;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -63,8 +65,7 @@
AxisService service = new AxisService(serviceName);
service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
- service.setFileName(className);
-
+ service.setFileName((new File(className)).toURL());
QName prepareOperationName = new QName(Constants.WS_COOR,
"prepareOperation");
AxisOperation prepareOperationDesc;
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,10 +16,16 @@
*/
package org.apache.kandula.wscoor;
+import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
@@ -43,11 +49,7 @@
import org.apache.kandula.faults.KandulaGeneralException;
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;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAPEnvelope;
-import org.apache.ws.commons.soap.SOAPFactory;
+import org.codehaus.jam.internal.elements.ParameterImpl;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -158,7 +160,7 @@
AxisService service = new AxisService(serviceName);
service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, className));
- service.setFileName(className);
+ service.setFileName((new File(className)).toURL());
responseOperationDesc = new InOnlyAxisOperation();
responseOperationDesc.setName(operationName);
Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLAsyncMessageReceiver.java Sat May 6 22:48:12 2006
@@ -16,12 +16,12 @@
*/
package org.apache.kandula.wscoor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.kandula.Constants;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.soap.SOAPEnvelope;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -40,8 +40,7 @@
Object obj = getTheImplementationObject(msgContext);
//Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj, msgContext,
- newMsgContext);
+ DependencyManager.configureBusinessLogicProvider(obj, msgContext.getOperationContext());
ActivationPortTypeRawXMLSkeleton skel = (ActivationPortTypeRawXMLSkeleton) obj;
//Out Envelop
@@ -71,7 +70,7 @@
newMsgContext.setEnvelope(envelope);
newMsgContext
.setWSAAction(Constants.WS_COOR_CREATE_COORDINATIONCONTEXT_RESPONSE);
- newMsgContext.setRelatesTo(null);
+ newMsgContext.setRelationships(null);
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -18,6 +18,10 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
@@ -25,10 +29,6 @@
import org.apache.kandula.coordinator.Coordinator;
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,12 +16,12 @@
*/
package org.apache.kandula.wscoor;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
import org.apache.kandula.context.AbstractContext;
import org.apache.kandula.context.CoordinationContext;
import org.apache.kandula.storage.StorageFactory;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,10 +16,16 @@
*/
package org.apache.kandula.wscoor;
+import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
@@ -44,11 +50,7 @@
import org.apache.kandula.faults.KandulaGeneralException;
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;
-import org.apache.ws.commons.om.OMNamespace;
-import org.apache.ws.commons.soap.SOAPEnvelope;
-import org.apache.ws.commons.soap.SOAPFactory;
+import org.codehaus.jam.internal.elements.ParameterImpl;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -156,8 +158,9 @@
KandulaListener listener = KandulaListener.getInstance();
AxisService service = new AxisService(serviceName);
- service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS, className));
- service.setFileName(className);
+ service.addParameter(new Parameter(
+ AbstractMessageReceiver.SERVICE_CLASS, className));
+ service.setFileName((new File(className)).toURL());
responseOperationDesc = new InOnlyAxisOperation();
responseOperationDesc.setName(operationName);
@@ -171,4 +174,4 @@
listener.start();
return new EndpointReference(listener.getHost() + serviceName);
}
-}
\ No newline at end of file
+}
Modified: 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=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLAsyncMessageReceiver.java Sat May 6 22:48:12 2006
@@ -16,12 +16,12 @@
*/
package org.apache.kandula.wscoor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.kandula.Constants;
-import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.soap.SOAPEnvelope;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
@@ -40,8 +40,7 @@
Object obj = getTheImplementationObject(msgContext);
//Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj, msgContext,
- newMsgContext);
+ DependencyManager.configureBusinessLogicProvider(obj, msgContext.getOperationContext());
RegistrationPortTypeRawXMLSkeleton skel = (RegistrationPortTypeRawXMLSkeleton) obj;
//Out Envelop
@@ -70,7 +69,7 @@
}
newMsgContext.setEnvelope(envelope);
newMsgContext.setWSAAction(Constants.WS_COOR_REGISTER_RESPONSE);
- newMsgContext.setRelatesTo(null);
+ newMsgContext.setRelationships(null);
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -18,6 +18,10 @@
import javax.xml.namespace.QName;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
@@ -26,10 +30,6 @@
import org.apache.kandula.faults.AbstractKandulaException;
import org.apache.kandula.storage.StorageFactory;
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;
-import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@apache.org"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -16,6 +16,7 @@
*/
package org.apache.kandula.wscoor;
+import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.kandula.Constants;
@@ -23,7 +24,6 @@
import org.apache.kandula.context.impl.ATActivityContext;
import org.apache.kandula.storage.StorageFactory;
import org.apache.kandula.utility.EndpointReferenceFactory;
-import org.apache.ws.commons.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -89,7 +89,7 @@
KandulaDemoServiceStub stub = new KandulaDemoServiceStub(
"target/initiator-repository",
new EndpointReference(
- "http://127.0.0.1:8085/Transactions_Service_Indigo/TransactionalService.svc"));
+ "http://131.107.72.15:8085/Transactions_Service_Indigo/TransactionalService.svc"));
stub.creditOperation();
// try{
tm.commit();
Modified: webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoService.java
URL: http://svn.apache.org/viewcvs/webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoService.java?rev=400430&r1=400429&r2=400430&view=diff
==============================================================================
--- webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoService.java (original)
+++ webservices/kandula/trunk/java/test/org/apache/kandula/integration/KandulaDemoService.java Sat May 6 22:48:12 2006
@@ -16,7 +16,7 @@
*/
package org.apache.kandula.integration;
-import org.apache.ws.commons.om.OMElement;
+import org.apache.axiom.om.OMElement;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
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=400430&r1=400429&r2=400430&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 Sat May 6 22:48:12 2006
@@ -18,6 +18,9 @@
import java.io.IOException;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
@@ -31,9 +34,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.OutOnlyAxisOperation;
-import org.apache.ws.commons.om.OMAbstractFactory;
-import org.apache.ws.commons.soap.SOAPEnvelope;
-import org.apache.ws.commons.soap.SOAPFactory;
/**
* @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
---------------------------------------------------------------------
To unsubscribe, e-mail: kandula-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: kandula-dev-help@ws.apache.org