axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r365593 [2/2] - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/rpc/client/ codegen/src/org/apache/axis2/wsdl/template/java/ core/src/org/apache/axis2/client/ core/src/org/apache/axis2/deployment/ core/src/org/apache/...
Date Tue, 03 Jan 2006 09:53:59 GMT
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
Tue Jan  3 01:52:10 2006
@@ -58,7 +58,7 @@
             ConfigurationContextFactory factory = new ConfigurationContextFactory();
             ConfigurationContext configContext =
                     factory.buildConfigurationContext("target/test-resources/integrationRepo");
-            ServiceClient sender = new ServiceClient(configContext);
+            ServiceClient sender = new ServiceClient(configContext, null);
             sender.setOptions(options);
             OMElement result = sender.sendReceive(payload);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
Tue Jan  3 01:52:10 2006
@@ -44,7 +44,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);
         OMElement result = sender.sendReceive(payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
Tue Jan  3 01:52:10 2006
@@ -19,7 +19,6 @@
 import junit.framework.TestCase;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Call;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
@@ -97,7 +96,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         OMElement result = sender.sendReceive(payload);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
Tue Jan  3 01:52:10 2006
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.ModuleDescription;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.util.threadpool.ThreadPool;
 
 import javax.xml.namespace.QName;
 import java.io.File;
@@ -139,6 +138,21 @@
 
         return new ServiceGroupContext(configContext, service.getParent())
                 .getServiceContext(service);
+    }
+
+    public static ConfigurationContext createClientConfigurationContext() throws AxisFault
{
+        File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
+                + "/modules/addressing.mar");
+        TestCase.assertTrue(file.exists());
+        DeploymentEngine deploymentEngine = new DeploymentEngine();
+
+        ConfigurationContextFactory efac = new ConfigurationContextFactory();
+        ConfigurationContext configContext = efac .buildConfigurationContext("target/test-resources/integrationRepo");
+        ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
+                configContext.getAxisConfiguration());
+        configContext.getAxisConfiguration().addModule(moduleDesc);
+        configContext.getAxisConfiguration().engageModule(new QName("addressing"));
+        return configContext;
     }
 
     public static ServiceContext createAdressedEnabledClientSide(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
Tue Jan  3 01:52:10 2006
@@ -27,8 +27,6 @@
 import org.apache.axis2.client.async.Callback;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
-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;
@@ -56,7 +54,7 @@
 
     private AxisService service;
     private AxisService clientService;
-    private ServiceContext serviceContext;
+    private ConfigurationContext configContext;
 
     private boolean finish = false;
     private Log log = LogFactory.getLog(getClass());
@@ -81,7 +79,7 @@
         clientService = Utils.createSimpleService(serviceName,
                 Echo.class.getName(),
                 operationName);
-        serviceContext = UtilServer.createAdressedEnabledClientSide(clientService);
+        configContext = UtilServer.createClientConfigurationContext();
     }
 
     protected void tearDown() throws Exception {
@@ -114,23 +112,23 @@
                     result.getResponseEnvelope().serialize(XMLOutputFactory.newInstance()
                             .createXMLStreamWriter(System.out));
                 } catch (XMLStreamException e) {
-                    reportError(e);
+                    onError(e);
                 } finally {
                     finish = true;
                 }
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
         };
 
-        ServiceClient sender = new ServiceClient(serviceContext);
-        sender.setCurrentOperationName(operationName);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
+        sender.engageModule(new QName("addressing"));
         sender.setOptions(options);
         options.setTo(targetEPR);
-        sender.sendReceiveNonblocking(payload, callback);
+        sender.sendReceiveNonblocking(operationName, payload, callback);
 
 
         int index = 0;
@@ -152,12 +150,11 @@
         options.setTransportInProtocol(Constants.TRANSPORT_JMS);
         options.setAction(serviceName.getLocalPart());
         options.setSoapAction("EchoXMLService/echoOMElement");
-        ServiceClient sender = new ServiceClient(serviceContext);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
-        sender.setCurrentOperationName(operationName);
         options.setTo(targetEPR);
 
-        OMElement result = sender.sendReceive(payload);
+        OMElement result = sender.sendReceive(operationName, payload);
 
 
         result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
@@ -183,12 +180,11 @@
         options.setSoapAction("EchoXMLService/echoOMElement");
         options.setUseSeparateListener(true);
 
-        ServiceClient sender = new ServiceClient(serviceContext);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
-        sender.setCurrentOperationName(operationName);
         options.setTo(targetEPR);
 
-        OMElement result = sender.sendReceive(payloadElement);
+        OMElement result = sender.sendReceive(operationName, payloadElement);
 
         result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
                 System.out));
@@ -232,15 +228,12 @@
 
         AxisConfiguration axisConfig = configContext.getAxisConfiguration();
         axisConfig.addService(srevice);
-        ServiceContext serviceContext = new ServiceGroupContext(configContext,
-                srevice.getParent()).getServiceContext(srevice);
 
-        ServiceClient sender = new ServiceClient(serviceContext);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
-        sender.setCurrentOperationName(operationName);
         options.setTo(targetEPR);
 
-        OMElement result = sender.sendReceive(method);
+        OMElement result = sender.sendReceive(operationName, method);
 
 
         result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
Tue Jan  3 01:52:10 2006
@@ -130,16 +130,15 @@
                     finish = true;
                 }
 
-                public void reportError(Exception e) {
+                public void onError(Exception e) {
                     log.error(e.getMessage(), e);
                     finish = true;
                 }
             };
-            ServiceClient sender = new ServiceClient(clientServiceContext);
-            sender.setCurrentOperationName(operationName);
+            ServiceClient sender = new ServiceClient(clientConfigContext, clientService);
             sender.setOptions(options);
             options.setTo(targetEPR);
-            sender.sendReceiveNonblocking(createEnvelope(value), callback);
+            sender.sendReceiveNonblocking(operationName,createEnvelope(value), callback);
 
             int index = 0;
             while (!finish) {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
Tue Jan  3 01:52:10 2006
@@ -131,23 +131,22 @@
                             XMLOutputFactory.newInstance()
                                     .createXMLStreamWriter(System.out));
                 } catch (XMLStreamException e) {
-                    reportError(e);
+                    onError(e);
                 } finally {
                     finish = true;
                 }
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
         };
 
-        ServiceClient sender = new ServiceClient(serviceContext);
+        ServiceClient sender = new ServiceClient(configContext, service);
         sender.setOptions(options);
-        sender.setCurrentOperationName(operationName);
         options.setTo(targetEPR);
-        sender.sendReceiveNonblocking(createEnvelope(), callback);
+        sender.sendReceiveNonblocking(operationName, createEnvelope(), callback);
 
         int index = 0;
         while (!finish) {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponseRawXMLTest.java
Tue Jan  3 01:52:10 2006
@@ -27,7 +27,6 @@
 import org.apache.axis2.client.async.Callback;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutInAxisOperation;
@@ -113,8 +112,6 @@
         service.addOperation(axisOperation);
         configContext.getAxisConfiguration().addService(service);
 
-
-        ServiceContext serviceContext = Utils.fillContextInformation(axisOperation, service,
configContext);
         Options options = new Options();
         options.setTo(targetEPR);
         options.setTransportInProtocol(Constants.TRANSPORT_MAIL);
@@ -126,22 +123,21 @@
                             XMLOutputFactory.newInstance()
                                     .createXMLStreamWriter(System.out));
                 } catch (XMLStreamException e) {
-                    reportError(e);
+                    onError(e);
                 } finally {
                     finish = true;
                 }
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
         };
-        ServiceClient sender = new ServiceClient(serviceContext);
+        ServiceClient sender = new ServiceClient(configContext, service);
         sender.setOptions(options);
-        sender.setCurrentOperationName(operationName);
         options.setTo(targetEPR);
-        sender.sendReceiveNonblocking(createEnvelope(), callback);
+        sender.sendReceiveNonblocking(operationName, createEnvelope(), callback);
         int index = 0;
         while (!finish) {
             Thread.sleep(1000);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
Tue Jan  3 01:52:10 2006
@@ -99,7 +99,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext(Constants.TESTING_PATH + "commons-http-enabledRepository");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
Tue Jan  3 01:52:10 2006
@@ -106,7 +106,7 @@
             ConfigurationContextFactory factory = new ConfigurationContextFactory();
             ConfigurationContext configContext =
                     factory.buildConfigurationContext("target/test-resources/integrationRepo");
-            ServiceClient sender = new ServiceClient(configContext);
+            ServiceClient sender = new ServiceClient(configContext, null);
             sender.setOptions(options);
             OMElement result = sender.sendReceive(payload);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
Tue Jan  3 01:52:10 2006
@@ -116,7 +116,7 @@
                 finish = true;
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
@@ -124,7 +124,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
 
         sender.sendReceiveNonblocking(payload, callback);
@@ -154,7 +154,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext,null);
         sender.setOptions(options);
         options.setTo(targetEPR);
         OMElement result = sender.sendReceive(payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
Tue Jan  3 01:52:10 2006
@@ -110,7 +110,7 @@
                 finish = true;
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
@@ -119,7 +119,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        ServiceClient sender = new ServiceClient(configContext);
+        ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(clientOptions);
 
         sender.sendReceiveNonblocking(payload, callback);
@@ -149,7 +149,7 @@
             ConfigurationContextFactory factory = new ConfigurationContextFactory();
             ConfigurationContext configContext =
                     factory.buildConfigurationContext("target/test-resources/integrationRepo");
-            ServiceClient sender = new ServiceClient(configContext);
+            ServiceClient sender = new ServiceClient(configContext, null);
             sender.setOptions(clientOptions);
 
             OMElement result = sender.sendReceive(payload);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
Tue Jan  3 01:52:10 2006
@@ -134,7 +134,7 @@
         ConfigurationContextFactory configfactory = new ConfigurationContextFactory();
         ConfigurationContext configContext = configfactory.buildConfigurationContext(
                 "target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
Tue Jan  3 01:52:10 2006
@@ -106,7 +106,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext(clientHome);
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);
 
@@ -161,7 +161,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         MyBean bean = new MyBean();
@@ -196,7 +196,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -216,7 +216,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -232,7 +232,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
 
         Options options = new Options();
         options.setTo(targetEPR);
@@ -257,7 +257,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
 
@@ -279,7 +279,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -301,7 +301,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -321,7 +321,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         Company com = new Company();
@@ -361,7 +361,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -382,7 +382,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -405,7 +405,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         MyBean bean = new MyBean();
@@ -440,7 +440,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -464,7 +464,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -491,7 +491,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         ArrayList args = new ArrayList();
@@ -514,7 +514,7 @@
         ConfigurationContextFactory factory = new ConfigurationContextFactory();
         ConfigurationContext configContext =
                 factory.buildConfigurationContext("target/test-resources/integrationRepo");
-        RPCServiceClient sender = new RPCServiceClient(configContext);
+        RPCServiceClient sender = new RPCServiceClient(configContext, null);
         sender.setOptions(options);
 
         OMElement elem = sender.sendReceive(getpayLoad());

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
Tue Jan  3 01:52:10 2006
@@ -28,7 +28,6 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutInAxisOperation;
@@ -59,7 +58,7 @@
 
     private AxisService service;
     private AxisService clientService;
-    private ServiceContext serviceContext;
+    private ConfigurationContext configContext;
 
     private boolean finish = false;
     private Log log = LogFactory.getLog(getClass());
@@ -84,7 +83,7 @@
         clientService = Utils.createSimpleServiceforClient(serviceName,
                 Echo.class.getName(),
                 operationName);
-        serviceContext = UtilServer.createAdressedEnabledClientSide(clientService);
+        configContext = UtilServer.createClientConfigurationContext();
     }
 
     protected void tearDown() throws Exception {
@@ -115,23 +114,22 @@
                     result.getResponseEnvelope().serialize(XMLOutputFactory.newInstance()
                             .createXMLStreamWriter(System.out));
                 } catch (XMLStreamException e) {
-                    reportError(e);
+                    onError(e);
                 } finally {
                     finish = true;
                 }
             }
 
-            public void reportError(Exception e) {
+            public void onError(Exception e) {
                 log.info(e.getMessage());
                 finish = true;
             }
         };
 
-        ServiceClient sender = new ServiceClient(serviceContext);
-        sender.setCurrentOperationName(operationName);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
 
-        sender.sendReceiveNonblocking(payload, callback);
+        sender.sendReceiveNonblocking(operationName, payload, callback);
 
         int index = 0;
         while (!finish) {
@@ -152,10 +150,9 @@
         options.setTo(targetEPR);
         options.setTransportInProtocol(Constants.TRANSPORT_TCP);
 
-        ServiceClient sender = new ServiceClient(serviceContext);
-        sender.setCurrentOperationName(operationName);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
-        OMElement result = sender.sendReceive(payload);
+        OMElement result = sender.sendReceive(operationName, payload);
 
         result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
                 System.out));
@@ -177,10 +174,9 @@
         options.setTransportInProtocol(Constants.TRANSPORT_TCP);
         options.setUseSeparateListener(true);
 
-        ServiceClient sender = new ServiceClient(serviceContext);
-        sender.setCurrentOperationName(operationName);
+        ServiceClient sender = new ServiceClient(configContext, clientService);
         sender.setOptions(options);
-        OMElement result = sender.sendReceive(payloadElement);
+        OMElement result = sender.sendReceive(operationName, payloadElement);
 
         result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
                 System.out));

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
Tue Jan  3 01:52:10 2006
@@ -25,7 +25,7 @@
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.client.async.AsyncResult;
 import org.apache.axis2.client.async.Callback;
-import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
@@ -50,7 +50,7 @@
     private QName serviceName = new QName("EchoXMLService");
     private QName operationName = new QName("echoOMElement");
     private AxisService service;
-    private ServiceContext serviceContext;
+    private ConfigurationContext configContext;
 
     private Log log = LogFactory.getLog(getClass());
 
@@ -78,7 +78,7 @@
                 Utils.createSimpleServiceforClient(serviceName,
                         org.apache.axis2.engine.Echo.class.getName(),
                         operationName);
-        serviceContext = UtilServer.createAdressedEnabledClientSide(service);
+        configContext = UtilServer.createClientConfigurationContext();
     }
 
     protected void tearDown() throws Exception {
@@ -108,23 +108,22 @@
                         result.getResponseEnvelope().serializeAndConsume(XMLOutputFactory.newInstance()
                                 .createXMLStreamWriter(System.out));
                     } catch (XMLStreamException e) {
-                        reportError(e);
+                        onError(e);
                     } finally {
                         finish = true;
                     }
                 }
 
-                public void reportError(Exception e) {
+                public void onError(Exception e) {
                     log.info(e.getMessage());
                     finish = true;
                 }
             };
 
-            sender = new ServiceClient(serviceContext);
-            sender.setCurrentOperationName(operationName);
+            sender = new ServiceClient(configContext, service);
             sender.setOptions(options);
 
-            sender.sendReceiveNonblocking(method,callback);
+            sender.sendReceiveNonblocking(operationName, method, callback);
 
             int index = 0;
             while (!finish) {

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueCreateQueueCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -54,7 +54,7 @@
         getResults(body);
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
 
     }
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueDeleteQueueCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -49,7 +49,7 @@
         this.button.setText("Delete Queue");
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
 
     }
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueEnqueueCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -54,7 +54,7 @@
         getResults(body);
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
 
     }
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueListMyQueuesCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -56,7 +56,7 @@
         this.button.setText("Load Queue");
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
 
     }
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/SimpleQueueReadCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -48,7 +48,7 @@
         this.getQueueEntryBody(body);
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
 
     }
 

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -190,7 +190,7 @@
         GUIHandler.showResults(strURL + endHTML);
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
         e.printStackTrace();
     }
 }

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
Tue Jan  3 01:52:10 2006
@@ -155,7 +155,7 @@
         this.handler.showResults(snippet);
     }
 
-    public void reportError(Exception e) {
+    public void onError(Exception e) {
         e.printStackTrace();
     }
 }

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
Tue Jan  3 01:52:10 2006
@@ -173,7 +173,7 @@
             }
         }
 
-        public void reportError(Exception e) {
+        public void onError(Exception e) {
             observer.updateError(e.getMessage());
         }
     }

Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
Tue Jan  3 01:52:10 2006
@@ -56,11 +56,11 @@
 
 
                     } catch (XMLStreamException e) {
-                        reportError(e);
+                        onError(e);
                     }
                 }
 
-                public void reportError(Exception e) {
+                public void onError(Exception e) {
                     e.printStackTrace();
                 }
             };

Modified: webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=365593&r1=365592&r2=365593&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
Tue Jan  3 01:52:10 2006
@@ -59,11 +59,11 @@
 
 
                     } catch (XMLStreamException e) {
-                        reportError(e);
+                        onError(e);
                     }
                 }
 
-                public void reportError(Exception e) {
+                public void onError(Exception e) {
                     e.printStackTrace();
                 }
             };



Mime
View raw message