axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r328554 [6/6] - in /webservices/axis2/trunk/java: modules/codegen/src/org/apache/axis2/databinding/extensions/ modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/ modules/codegen/src/org/apache/axis2/rpc/ modules/codegen/s...
Date Wed, 26 Oct 2005 04:33:01 GMT
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java
Tue Oct 25 21:29:17 2005
@@ -19,7 +19,7 @@
 //todo
 
 import junit.framework.TestCase;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.util.Utils;
@@ -46,7 +46,7 @@
     protected void setUp() throws Exception {
         UtilServer.start();
 
-        ServiceDescription service =
+        AxisService service =
                 Utils.createSimpleService(serviceName,
                         Echo.class.getName(),
                         operationName);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
Tue Oct 25 21:29:17 2005
@@ -22,9 +22,9 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
@@ -57,7 +57,7 @@
     //private Thread thisThread;
     // private SimpleHTTPServer sas;
     private ServiceContext serviceContext;
-    private ServiceDescription service;
+    private AxisService service;
 
     private boolean finish = false;
 

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=328554&r1=328553&r2=328554&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 Oct 25 21:29:17 2005
@@ -18,43 +18,42 @@
 
 package org.apache.axis2.rpc;
 
+import junit.framework.TestCase;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.InOutOperationDescrition;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.util.BeanSerializerUtil;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
-import org.apache.axis2.rpc.client.RPCCall;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
+import org.apache.axis2.rpc.client.RPCCall;
+import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.util.BeanSerializerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.wsdl.WSDLService;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.FactoryConfigurationError;
-import java.text.SimpleDateFormat;
+import javax.xml.stream.XMLStreamReader;
 import java.io.ByteArrayInputStream;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
 public class MultirefTest extends TestCase {
 
     private SimpleDateFormat zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
@@ -74,7 +73,7 @@
     protected AxisConfiguration engineRegistry;
     protected MessageContext mc;
     protected ServiceContext serviceContext;
-    protected ServiceDescription service;
+    protected AxisService service;
 
     protected boolean finish = false;
 
@@ -95,11 +94,11 @@
                         + "/axis/services/EchoXMLService/" + opName);
         String className = "org.apache.axis2.rpc.RPCServiceClass";
         operationName = new QName("http://localhost/my", opName, "req");
-        ServiceDescription service = new ServiceDescription(serviceName);
+        AxisService service = new AxisService(serviceName);
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
                 className));
-        OperationDescription axisOp = new InOutOperationDescrition(operationName);
+        AxisOperation axisOp = new InOutAxisOperation(operationName);
         axisOp.setMessageReceiver(new RPCMessageReceiver());
         axisOp.setStyle(WSDLService.STYLE_RPC);
         service.addOperation(axisOp);

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=328554&r1=328553&r2=328554&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 Oct 25 21:29:17 2005
@@ -23,15 +23,15 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.InOutOperationDescrition;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.rpc.client.RPCCall;
@@ -42,16 +42,16 @@
 import org.apache.wsdl.WSDLService;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.FactoryConfigurationError;
+import java.io.ByteArrayInputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
-import java.io.ByteArrayInputStream;
 
 public class RPCCallTest extends TestCase {
 
@@ -72,7 +72,7 @@
     protected AxisConfiguration engineRegistry;
     protected MessageContext mc;
     protected ServiceContext serviceContext;
-    protected ServiceDescription service;
+    protected AxisService service;
 
     protected boolean finish = false;
 
@@ -133,11 +133,11 @@
                         + "/axis/services/EchoXMLService/" + opName);
         String className = "org.apache.axis2.rpc.RPCServiceClass";
         operationName = new QName("http://localhost/my", opName, "req");
-        ServiceDescription service = new ServiceDescription(serviceName);
+        AxisService service = new AxisService(serviceName);
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
                 className));
-        OperationDescription axisOp = new InOutOperationDescrition(operationName);
+        AxisOperation axisOp = new InOutAxisOperation(operationName);
         axisOp.setMessageReceiver(new RPCMessageReceiver());
         axisOp.setStyle(WSDLService.STYLE_RPC);
         service.addOperation(axisOp);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
Tue Oct 25 21:29:17 2005
@@ -19,10 +19,10 @@
 import junit.framework.TestCase;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.OutInOperationDescription;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.impl.llom.OMTextImpl;
@@ -50,7 +50,7 @@
 
     private ServiceContext serviceContext;
 
-    private ServiceDescription service;
+    private AxisService service;
 
     private boolean finish = false;
 
@@ -66,12 +66,12 @@
 
     protected void setUp() throws Exception {
         UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
-        service = new ServiceDescription(serviceName);
+        service = new AxisService(serviceName);
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         service.addParameter(new ParameterImpl(
                         AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
                                 .getName()));
-        OperationDescription axisOp = new OutInOperationDescription(operationName);
+        AxisOperation axisOp = new OutInAxisOperation(operationName);
         axisOp.setMessageReceiver(new RawXMLINOutMessageReceiver());
         axisOp.setStyle(WSDLService.STYLE_DOC);
         service.addOperation(axisOp);

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=328554&r1=328553&r2=328554&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 Oct 25 21:29:17 2005
@@ -27,9 +27,9 @@
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.OutInOperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilsTCPServer;
@@ -60,8 +60,8 @@
 
     private MessageContext mc;
     private SimpleHTTPServer sas;
-    private ServiceDescription service;
-    private ServiceDescription clientService;
+    private AxisService service;
+    private AxisService clientService;
     private ServiceContext serviceContext;
 
     private boolean finish = false;
@@ -174,7 +174,7 @@
     }
 
     public void testEchoXMLCompleteSync() throws Exception {
-        ServiceDescription service =
+        AxisService service =
                 Utils.createSimpleService(serviceName,
                         Echo.class.getName(),
                         operationName);
@@ -208,7 +208,7 @@
         ConfigurationContextFactory confac = new ConfigurationContextFactory();
         ConfigurationContext configContext= confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
 
-        OperationDescription opdesc = new OutInOperationDescription(new QName("echoOMElement"));
+        AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
         org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(Constants.TESTING_REPOSITORY);
         call.setTo(targetEPR);
 
@@ -227,11 +227,11 @@
         envelope.getBody().addChild(method);
 
         MessageContext requestContext = new MessageContext(configContext);
-        ServiceDescription srevice = new ServiceDescription(serviceName);
+        AxisService srevice = new AxisService(serviceName);
         srevice.addOperation(opdesc);
         configContext.getAxisConfiguration().addService(srevice);
-        requestContext.setServiceDescription(service);
-        requestContext.setOperationDescription(opdesc);
+        requestContext.setAxisService(service);
+        requestContext.setAxisOperation(opdesc);
 
         //  requestContext.setTo(targetEPR);
 

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=328554&r1=328553&r2=328554&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 Oct 25 21:29:17 2005
@@ -25,7 +25,7 @@
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilsTCPServer;
@@ -54,7 +54,7 @@
 
     private MessageContext mc;
     private SimpleHTTPServer sas;
-    private ServiceDescription service;
+    private AxisService service;
     private ServiceContext serviceContext;
 
     private Log log = LogFactory.getLog(getClass());
@@ -80,7 +80,7 @@
                         operationName);
         UtilsTCPServer.deployService(service);
 
-        ServiceDescription service =
+        AxisService service =
                 Utils.createSimpleService(serviceName,
                         org.apache.axis2.engine.Echo.class.getName(),
                         operationName);
@@ -104,7 +104,7 @@
     }
 
     public void testEchoXMLCompleteASync() throws Exception {
-        ServiceDescription service =
+        AxisService service =
                 Utils.createSimpleService(serviceName,
                         Echo.class.getName(),
                         operationName);

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
Tue Oct 25 21:29:17 2005
@@ -21,8 +21,8 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.OutInOperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.OutInAxisOperation;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;
@@ -164,7 +164,7 @@
                             .createXMLStreamWriter
                             (System.out));
             QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
-            OperationDescription opdesc = new OutInOperationDescription(opName);
+            AxisOperation opdesc = new OutInAxisOperation(opName);
             call.invokeNonBlocking(opdesc,
                     requestContext,
                     new ClientCallbackHandler());

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
Tue Oct 25 21:29:17 2005
@@ -21,8 +21,8 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.OutInOperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.OutInAxisOperation;
 import sample.google.common.util.PropertyLoader;
 
 import javax.xml.namespace.QName;
@@ -100,8 +100,8 @@
                     Constants.TRANSPORT_HTTP,
                     false);
             QName opName = new QName("urn:GoogleSearch", "doGoogleSearch");
-            OperationDescription opdesc = new OutInOperationDescription(opName);
-            //   OperationDescription opdesc = new OperationDescription(new QName("viewVersion"));
+            AxisOperation opdesc = new OutInAxisOperation(opName);
+            //   AxisOperation opdesc = new AxisOperation(new QName("viewVersion"));
             call.invokeNonBlocking(opdesc,
                     requestContext,
                     new ClientCallbackHandler(this.gui));

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Tue
Oct 25 21:29:17 2005
@@ -20,9 +20,9 @@
 import groovy.lang.GroovyObject;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -52,11 +52,11 @@
         MessageContext outMessage)
         throws AxisFault {
         try {
-            ServiceDescription service =
+            AxisService service =
                 inMessage
                     .getOperationContext()
                     .getServiceContext()
-                    .getServiceConfig();
+                    .getAxisService();
             Parameter implInfoParam = service.getParameter("ServiceClass");
             if (implInfoParam == null) {
                 throw new AxisFault(
@@ -72,8 +72,8 @@
             }
 
             //look at the method name. if available this should be a groovy method
-            OperationDescription op =
-                inMessage.getOperationContext().getOperationDescription();
+            AxisOperation op =
+                inMessage.getOperationContext().getAxisOperation();
             if (op == null) {
                 throw new AxisFault(
                     Messages.getMessage("notFound", "Operation"));

Modified: webservices/axis2/trunk/java/modules/samples/xdocs/amazonSearch/AmazonSearch.htm
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/xdocs/amazonSearch/AmazonSearch.htm?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/xdocs/amazonSearch/AmazonSearch.htm (original)
+++ webservices/axis2/trunk/java/modules/samples/xdocs/amazonSearch/AmazonSearch.htm Tue Oct
25 21:29:17 2005
@@ -39,7 +39,7 @@
 <p>The request soap message is built at the ClientUtil class. According to the Amazon
Web API wsdl file, required namespaces are selected and attached to the envelope. We don't
have to include anything in the header. The name of the first child element of the body should
be operation name and it should be namespace qualified. We also have to include the binding
namespace to this element. Here it is attached as an attribute to that element, </p>
 <p><code>OMElement opration = omFactory.createOMElement(&quot;doAmazonSearch&quot;,
&quot;urn:AmazonSearch&quot;, &quot;ns1&quot;); </code></p>
 <p><code>opration.addAttribute(&quot;SOAP-ENV:encordingStyle&quot;, &quot;http://schemas.xmlsoap.org/soap/encoding/&quot;,
null); </code></p>
-<p>All the child elements of the operation element are carrying required parameters
such as license key, query terms, results per page, etc. (for more information, click <a
href="http://www.amazon.com/gp/aws/sdk/102-7878352-1385727?s=AlexaWebInfoService&v=1%2d0%20"
target="_blank">here</a>), </p>
+<p>All the child elements of the axisOperation element are carrying required parameters
such as license key, query terms, results per page, etc. (for more information, click <a
href="http://www.amazon.com/gp/aws/sdk/102-7878352-1385727?s=AlexaWebInfoService&v=1%2d0%20"
target="_blank">here</a>), </p>
 <p><samp>&lt;soapenv:Envelope xmlns:soapenv=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot;
xmlns:tns=&quot;http://webservices.amazon.com/AWSAlexa/2005-02-01&quot; xmlns:SOAP-ENC=&quot;http://schemas.xmlsoap.org/soap/encoding/&quot;
xmlns:xsi=&quot;http://www.w3.org/1999/XMLSchema-instance/&quot; xmlns:xsd=&quot;http://www.w3.org/2001/XMLSchema&quot;
xmlns:soap=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot; xmlns:wsdl=&quot;http://schemas.xmlsoap.org/wsdl/&quot;&gt;<br>
 &lt;soapenv:Header&gt;&lt;/soapenv:Header&gt;<br>
 &lt;soapenv:Body&gt;<br>
@@ -56,7 +56,7 @@
 &lt;/soapenv:Body&gt;<br>
 &lt;/soapenv:Envelope&gt;</samp></p>
 <p>ClientCallbackHandler processing response soap and extract elements which have the
local name as &quot;NavigableURL&quot;. It has to work with Object Model(OM). You
can notice that it uses several Iteraters to go through the children of an OMElement. You
are returned and Object from the Iterater that can be casted to a OMNode. Since you can't
call for the children of an OMNode we have to cast it to a OMElement. Before that we have
to check it whether it is an OMElement, as follows. </p>
-<p><code>Iterator iterator0 = operation.getChildren(); </code></p>
+<p><code>Iterator iterator0 = axisOperation.getChildren(); </code></p>
 <p><code>while (iterator0.hasNext()) { </code></p>
 <p><code>OMNode node = (OMNode) iterator0.next(); </code></p>
 <p><code>if (node.getType() == OMNode.ELEMENT_NODE) { </code></p>
@@ -132,7 +132,7 @@
     <li><a href="http://www.amazon.com/gp/aws/sdk/main.html?s=AlexaWebInfoService&v=1-0&p=ApiReference/WebMapOperation">WebMap
</a></li>
   </ul>
 </ul>
-<p> You can extend this program to work these operations too. Because the soap requests
and responses are different, it will need separate ClientUtil classes and ClientCallbackHandler
classes to fulfill this task. Anyway you can define those classes with any name and the only
condition is when you invoke the operation you have to send an object of relevant CallbackHandler
class and it should extend the CallbackHandler too. </p>
+<p> You can extend this program to work these operations too. Because the soap requests
and responses are different, it will need separate ClientUtil classes and ClientCallbackHandler
classes to fulfill this task. Anyway you can define those classes with any name and the only
condition is when you invoke the axisOperation you have to send an object of relevant CallbackHandler
class and it should extend the CallbackHandler too. </p>
 <p>&nbsp; </p>
 <p>&nbsp; </p>
 <p>&nbsp; </p>

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
Tue Oct 25 21:29:17 2005
@@ -218,7 +218,7 @@
     public java.lang.ClassLoader getClassLoader() {
         try {
             MessageContext msgContext = (MessageContext) this.reqData.getMsgContext();
-            return msgContext.getServiceDescription().getClassLoader();
+            return msgContext.getAxisService().getClassLoader();
         } catch (Throwable t) {
             return super.getClassLoader();
         }

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
Tue Oct 25 21:29:17 2005
@@ -39,8 +39,8 @@
 	 * can be passed into the builder using which the WOM component can be built out of.
 	 * For example: The Enigne uses the WOM's components in the context hierarchy but 
 	 * those are extended components. 
-	 * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-	 * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+	 * (<code>AxisService</code> extends <code>WSDLService</code>.)
+	 * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
 	 * built in place of a <code>WSDLService</code>. This can be achieved by passing
the 
 	 * correct Component Factory that will instanciate the correct object for the WOM builder.
 	 * @param uri URI pointing to the WSDL document.
@@ -69,8 +69,8 @@
 	 * can be passed into the builder using which the WOM component can be built out of.
 	 * For example: The Enigne uses the WOM's components in the context hierarchy but 
 	 * those are extended components. 
-	 * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-	 * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+	 * (<code>AxisService</code> extends <code>WSDLService</code>.)
+	 * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
 	 * built in place of a <code>WSDLService</code>. This can be achieved by passing
the 
 	 * correct Component Factory that will instanciate the correct object for the WOM builder.
 	 * @param in InputStream from which the WSDL document can be read in.

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
Tue Oct 25 21:29:17 2005
@@ -41,8 +41,8 @@
 	 * can be passed into the builder using which the WOM component can be built out of.
 	 * For example: The Enigne uses the WOM's components in the context hierarchy but 
 	 * those are extended components. 
-	 * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-	 * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+	 * (<code>AxisService</code> extends <code>WSDLService</code>.)
+	 * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
 	 * built in place of a <code>WSDLService</code>. This can be achieved by passing
the 
 	 * correct Component Factory that will instanciate the correct object for the WOM builder.
 	 * @param uri URI pointing to the WSDL document.
@@ -75,8 +75,8 @@
 	 * can be passed into the builder using which the WOM component can be built out of.
 	 * For example: The Enigne uses the WOM's components in the context hierarchy but 
 	 * those are extended components. 
-	 * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-	 * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+	 * (<code>AxisService</code> extends <code>WSDLService</code>.)
+	 * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
 	 * built in place of a <code>WSDLService</code>. This can be achieved by passing
the 
 	 * correct Component Factory that will instanciate the correct object for the WOM builder.
 	 * @param in InputStream from which the WSDL document can be read in.

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
Tue Oct 25 21:29:17 2005
@@ -18,9 +18,6 @@
 
 import org.apache.axis2.util.XMLUtils;
 import org.apache.axis2.wsdl.WSDLVersionWrapper;
-import org.apache.axis2.wsdl.writer.WOMWriterFactory;
-import org.apache.axis2.wsdl.writer.WOMWriter;
-import org.apache.axis2.wsdl.writer.WriterException;
 import org.apache.axis2.wsdl.builder.WOMBuilder;
 import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
 import org.apache.wsdl.WSDLDescription;
@@ -28,15 +25,14 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class WSDL1ToWOMBuilder implements WOMBuilder {
 
@@ -58,8 +54,8 @@
      * can be passed into the builder using which the WOM component can be built out of.
      * For example: The Enigne uses the WOM's components in the context hierarchy but
      * those are extended components.
-     * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-     * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+     * (<code>AxisService</code> extends <code>WSDLService</code>.)
+     * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
      * built in place of a <code>WSDLService</code>. This can be achieved by
passing the
      * correct Component Factory that will instanciate the correct object for the WOM builder.
      * @param in InputStream from which the WSDL document can be read in.
@@ -105,8 +101,8 @@
      * can be passed into the builder using which the WOM component can be built out of.
      * For example: The Enigne uses the WOM's components in the context hierarchy but
      * those are extended components.
-     * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
-     * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+     * (<code>AxisService</code> extends <code>WSDLService</code>.)
+     * So when deployment build the WOM it would prefer to get a <code>AxisService</code>
      * built in place of a <code>WSDLService</code>. This can be achieved by
passing the
      * correct Component Factory that will instanciate the correct object for the WOM builder.
      * @param uri URI pointing to the WSDL document.

Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java
Tue Oct 25 21:29:17 2005
@@ -1,5 +1,8 @@
 package org.apache.axis2.wsdl.writer;
 
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.wsdl.WSDLVersionWrapper;
 import org.apache.axis2.wsdl.builder.WOMBuilder;
@@ -14,12 +17,14 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.Iterator;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -49,7 +54,7 @@
 
     }
 
-    public void testInputOutput() {
+    public void testInputOutput() throws XMLStreamException {
         try {
             // create the WOM from the given WSDL.
             WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1);
@@ -68,6 +73,10 @@
             // a String and feed
 
             Document expectedWSDLDocument = newDocument(getFileContentsAsString(testWSDL));
+
+            System.out.println(getChildrenCount(actualWSDL));
+//            System.out.println(getChildrenCount(testWSDL));
+
 //            assertXMLEqual(actualWSDLDocument, expectedWSDLDocument);
 
         } catch (WSDLException e) {
@@ -114,6 +123,27 @@
         }
         in.close();
         return returnString;
+    }
+
+    public int getChildrenCount(String xml) throws XMLStreamException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
+        OMElement documentElement = new StAXOMBuilder(bais).getDocumentElement();
+        int omElementCount = 0;
+        int omTextCount = 0;
+        Iterator childrenIter = documentElement.getChildren();
+        while (childrenIter.hasNext()) {
+            Object o = childrenIter.next();
+            if (o instanceof OMElement) {
+                omElementCount++;
+            } else if (o instanceof OMText) {
+                omTextCount++;
+            }
+        }
+
+        System.out.println("omElementCount = " + omElementCount);
+        System.out.println("omTextCount = " + omTextCount);
+
+        return omElementCount + omTextCount;
     }
 
 }

Modified: webservices/axis2/trunk/java/xdocs/mail-transport.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/mail-transport.html?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/mail-transport.html (original)
+++ webservices/axis2/trunk/java/xdocs/mail-transport.html Tue Oct 25 21:29:17 2005
@@ -75,10 +75,10 @@
         ml.start();
 
         // Setup a service that will echo what we send to the server.
-        ServiceDescription service = Utils.createSimpleService(serviceName,
+        AxisService axisService = Utils.createSimpleService(serviceName,
                 Echo.class.getName(), new QName("echoOMElement"));
-        configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
+        configContext.getAxisConfiguration().addService(axisService);
+        Utils.resolvePhases(configContext.getAxisConfiguration(), axisService);
         ServiceContext serviceContext = configContext
                 .createServiceContext(new QName("EchoXMLService"));
 </pre></source>
@@ -87,21 +87,21 @@
 have a look under the hood have a look at the MailServer and
 UtilsMailServer classes.</p>
 <p>Moving onto the client side
-have a look at the code listing below. It will call the service that
+have a look at the code listing below. It will call the axisService that
 was setup on the previous code listing.</p>
 <source><pre>
         ConfigurationContext configContext = UtilsMailServer
                 .createClientConfigurationContext();
-        ServiceDescription service = new ServiceDescription(serviceName);
-        OperationDescription operation = new OperationDescription(operationName);
-        operation.setMessageReceiver(new MessageReceiver() {
+        AxisService axisService = new AxisService(serviceName);
+        AxisOperation axisOperation = new AxisOperation(operationName);
+        axisOperation.setMessageReceiver(new MessageReceiver() {
                 public void receive(MessageContext messgeCtx) throws AxisFault {
                         envelope = messgeCtx.getEnvelope();
                 }
         });
-        service.addOperation(operation);
-        configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
+        axisService.addOperation(axisOperation);
+        configContext.getAxisConfiguration().addService(axisService);
+        Utils.resolvePhases(configContext.getAxisConfiguration(), axisService);
         ServiceContext serviceContext = configContext
                 .createServiceContext(serviceName);
         org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
@@ -109,7 +109,7 @@
         call.setTo(targetEPR);
         call.setTransportInfo(Constants.TRANSPORT_MAIL,
                 Constants.TRANSPORT_MAIL, true);
-        // Create a callback to set to the service invocation.
+        // Create a callback to set to the axisService invocation.
         Callback callback = new Callback() {
                 public void onComplete(AsyncResult result) {
                         try {
@@ -176,10 +176,10 @@
         ml.start();
 
         // Setup a simple service.
-        ServiceDescription service = Utils.createSimpleService(serviceName,
+        AxisService axisService = Utils.createSimpleService(serviceName,
                 Echo.class.getName(), operationName);
-        configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
+        configContext.getAxisConfiguration().addService(axisService);
+        Utils.resolvePhases(configContext.getAxisConfiguration(), axisService);
         ServiceContext serviceContext = configContext.createServiceContext(serviceName);
 </pre></source>
 <p>We have to create a separate ConfigurationContext and then use that. We are done;
wasn't that simple?</p>

Modified: webservices/axis2/trunk/java/xdocs/migration.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/migration.html?rev=328554&r1=328553&r2=328554&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/migration.html (original)
+++ webservices/axis2/trunk/java/xdocs/migration.html Tue Oct 25 21:29:17 2005
@@ -44,8 +44,8 @@
         public static void main(String [] args) {
                 try {
                         String endpoint = ...
-                        Service service = new Service();
-                        Call call = (Call) service.createCall();
+                        Service axisService = new Service();
+                        Call call = (Call) axisService.createCall();
                         call.setTargetEndpointAddress( new java.net.URL(endpoint) );
                         call.setOperationName(new QName("http://soapinterop.org/", echoString"));
                         String ret = (String) call.invoke( new Object[] { "Hello!" } );



Mime
View raw message