axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r154525 - in webservices/axis/trunk/java/modules: core/src/java/org/apache/axis/clientapi/ core/src/java/org/apache/axis/transport/ core/src/java/org/apache/axis/transport/http/ core/src/java/org/apache/axis/util/ core/src/test/org/apache/axis/transport/ om/src/java/org/apache/axis/om/
Date Sun, 20 Feb 2005 16:55:57 GMT
Author: dims
Date: Sun Feb 20 08:55:55 2005
New Revision: 154525

URL: http://svn.apache.org/viewcvs?view=rev&rev=154525
Log:
Fix minor spelling mistakes.

Added:
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
  (with props)
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
  (with props)
Removed:
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/OperationItemBean.java
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/ServiceItemBean.java
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/util/ServiceListBean.java
Modified:
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReciverLocator.java
    webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/transport/HTTPTrasportHeaderParsingTest.java
    webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java

Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Call.java
Sun Feb 20 08:55:55 2005
@@ -29,7 +29,7 @@
 import org.apache.axis.engine.EngineRegistryImpl;
 import org.apache.axis.om.OMException;
 import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.transport.TransportReciver;
+import org.apache.axis.transport.TransportReceiver;
 import org.apache.axis.transport.TransportReciverLocator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -119,7 +119,7 @@
             try {
                 //TODO This should be the Receiver.close();
                 //Receiver is taken using the
-                //TransportReciver reciver = TransportReciverLocator.locate(requestMessageContext);
+                //TransportReceiver reciver = TransportReciverLocator.locate(requestMessageContext);
                 out.close();
             } catch (IOException e1) {
                 throw new AxisFault();
@@ -156,8 +156,8 @@
                 request.setProperty(
                         MessageContext.TRANSPORT_TYPE,
                         transport);
-                TransportReciver reciver = TransportReciverLocator.locate(request);
-                reciver.invoke(request);
+                TransportReceiver receiver = TransportReciverLocator.locate(request);
+                receiver.invoke(request);
                 if(request.getProperty(MessageContext.TRANSPORT_SUCCEED)!= null){
                     throw new AxisFault("Sent failed");
                 } else if (request.getEnvelope().getBody().hasFault()){
@@ -205,8 +205,8 @@
             response.setProperty(
                     MessageContext.TRANSPORT_TYPE,
                     transport);
-            TransportReciver reciver = TransportReciverLocator.locate(response);
-            reciver.invoke(response);
+            TransportReceiver receiver = TransportReciverLocator.locate(response);
+            receiver.invoke(response);
             SOAPEnvelope resenvelope = response.getEnvelope();
 
             //TODO if the resenvelope is a SOAPFault then throw an exception

Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/clientapi/Invoker.java
Sun Feb 20 08:55:55 2005
@@ -19,7 +19,7 @@
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.EngineRegistry;
-import org.apache.axis.transport.TransportReciver;
+import org.apache.axis.transport.TransportReceiver;
 import org.apache.axis.transport.TransportReciverLocator;
 
 public class Invoker implements Runnable {
@@ -58,9 +58,9 @@
             resMsgContext.setServerSide(false);
 //            resMsgContext.setProperty(MessageContext.TRANSPORT_TYPE,
 //            Constants.TRANSPORT_HTTP);
-            TransportReciver reciver =
+            TransportReceiver receiver =
                     TransportReciverLocator.locate(resMsgContext);
-            reciver.invoke(resMsgContext);
+            receiver.invoke(resMsgContext);
 
             AsyncResult result = new AsyncResult();
             result.setResult(resMsgContext.getEnvelope());

Added: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java?view=auto&rev=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
(added)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
Sun Feb 20 08:55:55 2005
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.apache.axis.transport;
+
+import org.apache.axis.handlers.AbstractHandler;
+
+public abstract class TransportReceiver extends AbstractHandler {
+}

Propchange: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReciverLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReciverLocator.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReciverLocator.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReciverLocator.java
Sun Feb 20 08:55:55 2005
@@ -19,15 +19,15 @@
 import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.transport.http.HTTPTransportReciver;
+import org.apache.axis.transport.http.HTTPTransportReceiver;
 
 public class TransportReciverLocator {
     
-    public static TransportReciver locate(MessageContext msgContext)
+    public static TransportReceiver locate(MessageContext msgContext)
             throws AxisFault {
         String type = (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
         if (Constants.TRANSPORT_HTTP.equals(type)) {
-            return new HTTPTransportReciver();
+            return new HTTPTransportReceiver();
         } else {
             throw new AxisFault("No tranport found");
         }

Added: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java?view=auto&rev=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
(added)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
Sun Feb 20 08:55:55 2005
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+package org.apache.axis.transport.http;
+
+import org.apache.axis.addressing.AddressingConstants;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisEngine;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.builder.StAXBuilder;
+import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.transport.TransportReceiver;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HTTPTransportReceiver extends TransportReceiver {
+
+    private static final int END = 1;
+    private static final int END_OF_LINE = 2;
+    private static final int BEFORE_SEPERATOR = 3;
+    private static final int AFTER_SEPERATOR = 4;
+    private int lastRead = -1;
+
+    private char[] buf = new char[1024];
+    int index = 0;
+    int length = 0;
+    private boolean done = false;
+
+    public void invoke(MessageContext msgContext) throws AxisFault {
+        Reader in =
+                (Reader) msgContext.getProperty(MessageContext.TRANSPORT_READER);
+        if (in != null) {
+            boolean serverSide = msgContext.isServerSide();
+            Map map = parseTheHeaders(in, serverSide);
+            if (serverSide) {
+                msgContext.setProperty(MessageContext.SOAP_ACTION,
+                        map.get(HTTPConstants.HEADER_SOAP_ACTION));
+                msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,
+                        (String) map.get(HTTPConstants.REQUEST_URI)));
+                //TODO see is it a Service request e.g. WSDL, list ....
+                //              TODO take care of the other HTTPHeaders
+
+            } else {
+                if (HTTPConstants.RESPONSE_ACK_CODE_VAL.equals(map.get(HTTPConstants.RESPONSE_CODE)))
{
+                    msgContext.setProperty(MessageContext.TRANSPORT_SUCCEED,HTTPConstants.RESPONSE_ACK_CODE_VAL);
+                    return;
+                }
+                //TODO take care of other HTTP Headers
+            }
+            AxisEngine axisEngine =
+                    new AxisEngine(msgContext.getGlobalContext().getRegistry());
+            try {
+                XMLStreamReader xmlreader =
+                        XMLInputFactory.newInstance().createXMLStreamReader(in);
+                StAXBuilder builder =
+                        new StAXSOAPModelBuilder(OMFactory.newInstance(),
+                                xmlreader);
+                msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
+            } catch (Exception e) {
+                throw new AxisFault(e.getMessage(), e);
+            }
+
+            axisEngine.receive(msgContext);
+        } else {
+            throw new AxisFault("Input reader not found");
+        }
+
+    }
+
+    /**
+     * parses following two styles of HTTP stuff
+     * Server Side
+     * POST /axis2/services/echo HTTP/1.0
+     * Content-Type: text/xml; charset=utf-8
+     * Accept: application/soap+xml, application/dime, multipart/related, text/*
+     * User-Agent: Axis/1.2RC1
+     * Host: 127.0.0.1:8081
+     * Cache-Control: no-cache
+     * Pragma: no-cache
+     * SOAPAction: ""
+     * Content-Length: 73507
+     * <p/>
+     * HTTP/1.1 200 OK
+     * Content-Type: text/xml;charset=utf-8
+     * Date: Sat, 12 Feb 2005 10:39:39 GMT
+     * Server: Apache-Coyote/1.1
+     * Connection: close
+     *
+     * @param reader
+     * @return
+     */
+
+    public HashMap parseTheHeaders(Reader reader, boolean serverSide)
+            throws AxisFault {
+        HashMap map = new HashMap();
+        try {
+
+            StringBuffer str = new StringBuffer();
+
+            int state = BEFORE_SEPERATOR;
+
+            String key = null;
+            String value = null;
+
+            int start = 0;
+
+            length = readLine(reader, buf);
+            if (serverSide) {
+                if (buf[0] == 'P'
+                        && buf[1] == 'O'
+                        && buf[2] == 'S'
+                        && buf[3] == 'T') {
+                    index = 5;
+                    value = readFirstLineArg(' ');
+                    map.put(HTTPConstants.REQUEST_URI, value);
+                    value = readFirstLineArg('\n');
+                    map.put(HTTPConstants.PROTOCOL_VERSION, value);
+                } else {
+                    throw new AxisFault("Only the POST requests are supported");
+                }
+            } else {
+                index = 0;
+                value = readFirstLineArg(' ');
+                map.put(HTTPConstants.PROTOCOL_VERSION, value);
+                value = readFirstLineArg(' ');
+                map.put(HTTPConstants.RESPONSE_CODE, value);
+                value = readFirstLineArg('\n');
+                map.put(HTTPConstants.RESPONSE_WORD, value);
+            }
+
+            state = BEFORE_SEPERATOR;
+
+
+            while (!done) {
+                length = readLine(reader, buf);
+                if (length <= 0) {
+                    throw new AxisFault("Premature end of steam");
+                }
+                for (int i = 0; i < length; i++) {
+                    switch (state) {
+                        case BEFORE_SEPERATOR:
+                            if (buf[i] == ':') {
+                                key = str.toString();
+                                str = new StringBuffer();
+                                state = AFTER_SEPERATOR;
+
+                                if (buf[i + 1] == ' ') {
+                                    i++; //ignore next space
+                                }
+                            } else {
+                                str.append(buf[i]);
+                            }
+                            break;
+                        case AFTER_SEPERATOR:
+                            if (buf[i] == '\n') {
+                                value = str.toString();
+                                map.put(key, value);
+                                str = new StringBuffer();
+                                i = length;
+                            } else {
+                                str.append(buf[i]);
+                            }
+                            break;
+                            //                            case END_OF_LINE :
+                            //                                if (buf[i] == '\n') {
+                            //                                    state = END;
+                            //                                    break;
+                            //                                } else {
+                            //                                    state = BEFORE_SEPERATOR;
+                            //                                    str.append(buf[i]);
+                            //                                }
+                            //                                break;
+                            //                            case END:
+                            //                            break;    
+                        default :
+                            throw new AxisFault("Error Occured Unknown state " + state);
+
+                    }
+                }
+
+                state = BEFORE_SEPERATOR;
+
+            }
+        } catch (IOException e) {
+            throw new AxisFault(e.getMessage(), e);
+        }
+        return map;
+    }
+
+    //    public HashMap parseTheHeaders(Reader reader, boolean serverSide)
+    //        throws AxisFault {
+    //        HashMap map = new HashMap();
+    //        try {
+    //    
+    //            StringBuffer str = new StringBuffer();
+    //    
+    //            int state = BEFORE_SEPERATOR;
+    //    
+    //            String key = null;
+    //            String value = null;
+    //    
+    //            int start = 0;
+    //    
+    //            length = readLine(reader,buf);
+    //                
+    //                
+    //                
+    //            if (serverSide) {
+    //                if (buf[0] == 'P'
+    //                    && buf[1] == 'O'
+    //                    && buf[2] == 'S'
+    //                    && buf[3] == 'T') {
+    //                    index = 5;
+    //                    value = readFirstLineArg(' ');
+    //                    map.put(HTTPConstants.REQUEST_URI,value );
+    //                    value = readFirstLineArg('\n');
+    //                    map.put(
+    //                        HTTPConstants.PROTOCOL_VERSION,value);
+    //                    start = index;
+    //                } else {
+    //                    throw new AxisFault("Only the POST requests are supported");
+    //                }
+    //            } else {
+    //                index = 0;
+    //                value = readFirstLineArg(' ');
+    //                map.put(HTTPConstants.PROTOCOL_VERSION, value);
+    //                value = readFirstLineArg(' ');
+    //                map.put(HTTPConstants.RESPONSE_CODE,value);
+    //                value = readFirstLineArg('\n');
+    //                map.put(HTTPConstants.RESPONSE_WORD, value);
+    //                start = index;
+    //            }
+    //    
+    //            while (state != END) {
+    //                if(length <= 0){
+    //                    throw new AxisFault("Premature end of steam");
+    //                }
+    //                for (int i = start; i < length; i++) {
+    //                    System.out.println(state);
+    //                    switch (state) {
+    //                        case BEFORE_SEPERATOR :
+    //                            if (buf[i] == ':') {
+    //                                key = str.toString();
+    //                                str = new StringBuffer();
+    //                                state = AFTER_SEPERATOR;
+    //                                    
+    //                                if(buf[i+1] == ' '){
+    //                                    i++;//ignore next space
+    //                                }
+    //                            } else {
+    //                                str.append(buf[i]);
+    //                            }
+    //                            break;
+    //                        case AFTER_SEPERATOR :
+    //                            if (buf[i] == '\n') {
+    //                                value = str.toString();
+    //                                map.put(key, value);
+    //                                str = new StringBuffer();
+    //                                state = END_OF_LINE;
+    //                            } else {
+    //                                str.append(buf[i]);
+    //                            }
+    //                            break;
+    //                        case END_OF_LINE :
+    //                            if (buf[i] == '\n') {
+    //                                state = END;
+    //                                break;
+    //                            } else {
+    //                                state = BEFORE_SEPERATOR;
+    //                                str.append(buf[i]);
+    //                            }
+    //                            break;
+    //                        case END:
+    //                        break;    
+    //                        default :
+    //                            throw new AxisFault(
+    //                                "Error Occured Unknown state " + state);
+    //    
+    //                    }
+    //                }
+    //                start = 0;
+    //                if(state != END){
+    //                    length = reader.read(buf);
+    //                }
+    //                    
+    //    
+    //            }
+    //        } catch (IOException e) {
+    //            throw new AxisFault(e.getMessage(), e);
+    //        }
+    //        return map;
+    //    }
+    private String readFirstLineArg(char terminal) throws AxisFault {
+        StringBuffer str = new StringBuffer();
+        try {
+
+            while (buf[index] != terminal && index < length) {
+                str.append(buf[index]);
+                index++;
+            }
+            index++;
+            return str.toString();
+        } catch (Exception e) {
+            throw new AxisFault(e.getMessage(), e);
+        }
+
+    }
+
+    /**
+     * Read a single line from the input stream
+     *
+     * @param is  inputstream to read from
+     * @param b   byte array to read into
+     * @param off starting offset into the byte array
+     * @param len maximum number of bytes to read
+     */
+    protected int readLine(Reader is, char[] b) throws java.io.IOException {
+        int count = 0, c;
+
+        // System.out.println("inside here");
+        if (lastRead == -1) {
+            c = is.read();
+        } else {
+            c = lastRead;
+        }
+
+        int off = 0;
+        while (c != -1) {
+            if (c != '\n' && c != '\r') {
+                b[off++] = (char) c;
+                count++;
+                c = is.read();
+            } else {
+                if ('\n' == c) {
+                    c = is.read();
+                    if (c == '\r') {
+                        c = is.read();
+                    }
+                    //If the next line begins with tab or space then this is a continuation.
+                    if (c != ' ' && c != '\t') {
+                        if (c == '\n') {
+                            done = true;
+                        }
+                        lastRead = c;
+                        b[off++] = '\n';
+                        count++;
+                        break;
+                    }
+
+                } else {
+                    c = is.read();
+                }
+            }
+
+
+        }
+        if (c == -1) {
+            throw new AxisFault("Every line should ends with the \n, unexpected End of stream");
+        } else {
+            return count > 0 ? count : -1;
+        }
+
+    }
+
+}

Propchange: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
Sun Feb 20 08:55:55 2005
@@ -121,8 +121,8 @@
                                 out);
                         msgContext.setProperty(MessageContext.TRANSPORT_READER,
                                 in);
-                        HTTPTransportReciver reciver =
-                                new HTTPTransportReciver();
+                        HTTPTransportReceiver reciver =
+                                new HTTPTransportReceiver();
                         reciver.invoke(msgContext);
 
                     }

Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/transport/HTTPTrasportHeaderParsingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/transport/HTTPTrasportHeaderParsingTest.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/transport/HTTPTrasportHeaderParsingTest.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/transport/HTTPTrasportHeaderParsingTest.java
Sun Feb 20 08:55:55 2005
@@ -1,25 +1,25 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
 package org.apache.axis.transport;
 
 import org.apache.axis.AbstractTestCase;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.HTTPConstants;
-import org.apache.axis.transport.http.HTTPTransportReciver;
+import org.apache.axis.transport.http.HTTPTransportReceiver;
 
 import java.io.BufferedReader;
 import java.io.StringReader;
@@ -43,7 +43,7 @@
                 + "SOAPAction: \"\"\n"
                 + "Content-Length: 73507\n\nee rwewebtewbeww";
         StringReader reader = new StringReader(message);
-        HTTPTransportReciver reciver = new HTTPTransportReciver();
+        HTTPTransportReceiver reciver = new HTTPTransportReceiver();
 
         Map map = reciver.parseTheHeaders(reader, true);
         assertEquals(map.get(HTTPConstants.PROTOCOL_VERSION), "HTTP/1.0");
@@ -67,7 +67,7 @@
                 + "Server: Apache-Coyote/1.1\n"
                 + "Connection: close\n\nA";
         StringReader reader = new StringReader(message);
-        HTTPTransportReciver reciver = new HTTPTransportReciver();
+        HTTPTransportReceiver reciver = new HTTPTransportReceiver();
 
         Map map = reciver.parseTheHeaders(reader, false);
         assertEquals(map.get(HTTPConstants.PROTOCOL_VERSION), "HTTP/1.1");
@@ -89,7 +89,7 @@
                     + "Server: Apache-Coyote/1.1\n"
                     + "Connection: close";
             StringReader reader = new StringReader(message);
-            HTTPTransportReciver reciver = new HTTPTransportReciver();
+            HTTPTransportReceiver reciver = new HTTPTransportReceiver();
             BufferedReader br = new BufferedReader(reader);
             Map map = reciver.parseTheHeaders(br, false);
             fail("test must failed as \n\n is missing");

Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java?view=diff&r1=154524&r2=154525
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java Sun
Feb 20 08:55:55 2005
@@ -177,14 +177,14 @@
     public OMNode getFirstChild();
     
     /**
-     * Convienace extention of the getFristChild
+     * Convenience extension of the getFirstChild
      * @return
      */
     
     public OMElement getFirstElement();
 
     /**
-      * Convienace extention of the getNextSibling
+      * Convenience extension of the getNextSibling
       * @return
       */
     public OMElement getNextSiblingElement() throws OMException;



Mime
View raw message