You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/09/02 10:56:17 UTC
svn commit: r267164 - in /webservices/axis2/trunk/java:
modules/core/src/org/apache/axis2/context/
modules/core/src/org/apache/axis2/transport/http/
modules/integration/test/org/apache/axis2/engine/
modules/xml/src/org/apache/axis2/om/ modules/xml/src/...
Author: chinthaka
Date: Fri Sep 2 01:55:39 2005
New Revision: 267164
URL: http://svn.apache.org/viewcvs?rev=267164&view=rev
Log:
- Getting character encoding and version from the recd message properly
- OMOutput will not override the char encoding and version now
- char encoding will be handled correctly in HTTP now
- fixed typos in xdocs
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
webservices/axis2/trunk/java/xdocs/index.html
webservices/axis2/trunk/java/xdocs/otherTutorials.html
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Fri Sep 2 01:55:39 2005
@@ -56,7 +56,7 @@
* Field UTF_8
* This is the 'utf-8' value for CHARACTER_SET_ENCODING property
*/
- public static final String UTF_8 = "utf-8";
+ public static final String UTF_8 = "UTF-8";
/**
* Field UTF_8
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Fri Sep 2 01:55:39 2005
@@ -18,8 +18,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
@@ -31,6 +29,8 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.soap.SOAP11Constants;
+import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.transport.TransportSender;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.GetMethod;
@@ -236,8 +236,10 @@
XMLOutputFactory.newInstance().createXMLStreamWriter(
bytesOut,
charSetEnc);
- element.serialize(outputWriter);
- outputWriter.flush();
+ OMOutputImpl out = new OMOutputImpl(outputWriter);
+ out.setCharSetEncoding(charSetEnc);
+ element.serialize(out);
+ out.flush();
return bytesOut.toByteArray();
} catch (XMLStreamException e) {
throw new AxisFault(e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Fri Sep 2 01:55:39 2005
@@ -95,8 +95,7 @@
//Figure out the char set encoding and create the reader
//If charset is not specified
- if (contentType.indexOf(HTTPConstants.CHAR_SET_ENCODING)
- == -1) {
+ if ( getCharSetEncoding(contentType) == null ) {
xmlreader =
XMLInputFactory
.newInstance()
@@ -170,6 +169,18 @@
}
+ String charsetEncoding = builder.getDocument().getCharsetEncoding();
+ if(charsetEncoding != null && !"".equals(charsetEncoding) && !((String)msgContext.getProperty(MessageContext.CHARACTER_SET_ENCODING)).equalsIgnoreCase(charsetEncoding)){
+ String faultCode;
+ if(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelope.getNamespace().getName())){
+ faultCode = SOAP12Constants.FAULT_CODE_SENDER;
+ }else {
+ faultCode = SOAP11Constants.FAULT_CODE_SENDER;
+ }
+ throw new AxisFault("Character Set Encoding from transport information do not match with character set encoding in the received SOAP message", faultCode);
+ }
+
+
msgContext.setEnvelope(envelope);
AxisEngine engine = new AxisEngine(configurationContext);
if (envelope.getBody().hasFault()) {
@@ -200,10 +211,10 @@
}
/**
- * Extracts and returns the character set encoding from the
+ * Extracts and returns the character set encoding from the
* Content-type header
* Example:
- * Content-Type: text/xml; charset=utf-8
+ * Content-Type: text/xml; charset=utf-8
* @param contentType
*/
private static String getCharSetEncoding(String contentType) {
@@ -212,7 +223,7 @@
//Using the default UTF-8
return MessageContext.DEFAULT_CHAR_SET_ENCODING;
}
-
+
//If there are spaces around the '=' sign
int indexOfEq = contentType.indexOf("=", index);
//There can be situations where "charset" is not the last parameter of the Content-Type header
@@ -228,6 +239,10 @@
//There might be "" around the value - if so remove them
value = value.replaceAll("\"", "");
+ if("null".equalsIgnoreCase(value)){
+ return null;
+ }
+
return value.trim();
}
@@ -331,12 +346,25 @@
MIMEHelper mimeHelper = new MIMEHelper(inStream, contentTypeString,
fileCacheForAttachments, attachmentRepoDir,attachmentSizeThreshold);
- XMLStreamReader reader = XMLInputFactory.newInstance()
+ String charSetEncoding = getCharSetEncoding(mimeHelper.getSOAPPartContentType());
+ XMLStreamReader reader;
+ if(charSetEncoding == null || "null".equalsIgnoreCase(charSetEncoding)){
+ reader = XMLInputFactory.newInstance()
.createXMLStreamReader(
new BufferedReader(new InputStreamReader(mimeHelper
.getSOAPPartInputStream(),
- getCharSetEncoding(mimeHelper
- .getSOAPPartContentType()))));
+ charSetEncoding)));
+ msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, charSetEncoding);
+
+ }else {
+ reader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(
+ new BufferedReader(new InputStreamReader(mimeHelper
+ .getSOAPPartInputStream())));
+ msgContext.setProperty(MessageContext.CHARACTER_SET_ENCODING, MessageContext.UTF_8);
+
+ }
+
/*
* put a reference to Attachments in to the message context
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java Fri Sep 2 01:55:39 2005
@@ -16,13 +16,11 @@
*/
package org.apache.axis2.engine;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.integration.UtilServer;
@@ -34,6 +32,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+
/**
* Testing charater encoding support
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
@@ -96,8 +96,9 @@
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
Constants.TESTING_PATH + "chuncked-enabledRepository");
+ call.set(MessageContext.CHARACTER_SET_ENCODING, "UTF-16");
- call.setTo(targetEPR);
+ call.setTo(targetEPR);
call.setTransportInfo(Constants.TRANSPORT_HTTP,
Constants.TRANSPORT_HTTP, false);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Fri Sep 2 01:55:39 2005
@@ -41,6 +41,7 @@
public class EchoRawXMLOnTwoChannelsTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
+// + ("5556")
+ (UtilServer.TESTING_PORT)
+ "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMDocument.java Fri Sep 2 01:55:39 2005
@@ -52,8 +52,8 @@
/**
* Sets the XML version
- * @see OMDocumentImpl#XML_10 XML 1.0
- * @see OMDocumentImpl#XML_11 XML 1.1
+ * @see org.apache.axis2.om.impl.llom.OMDocumentImpl#XML_10 XML 1.0
+ * @see org.apache.axis2.om.impl.llom.OMDocumentImpl#XML_11 XML 1.1
* @param version
*/
public void setXMLVersion(String version);
@@ -70,7 +70,15 @@
*/
public void setCharsetEncoding(String charsetEncoding);
- /**
+ /**
+ * XML standalone value
+ * This will be yes, no or null (if not available)
+ * @return
+ */
+ public String isStandalone();
+ public void setStandalone(String isStandalone);
+
+ /**
* Serialize the OMDocument
* @param omOutput
* @throws XMLStreamException
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Fri Sep 2 01:55:39 2005
@@ -15,18 +15,17 @@
*/
package org.apache.axis2.om.impl;
-import org.apache.axis2.om.OMConstants;
-import org.apache.axis2.om.OMText;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
+ import org.apache.axis2.om.OMText;
+ import org.apache.axis2.soap.SOAP11Constants;
+ import org.apache.axis2.soap.SOAP12Constants;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.util.LinkedList;
+ import javax.xml.stream.FactoryConfigurationError;
+ import javax.xml.stream.XMLOutputFactory;
+ import javax.xml.stream.XMLStreamException;
+ import javax.xml.stream.XMLStreamWriter;
+ import java.io.ByteArrayOutputStream;
+ import java.io.OutputStream;
+ import java.util.LinkedList;
/**
@@ -49,10 +48,10 @@
* Field DEFAULT_CHAR_SET_ENCODING specifies the default
* character encoding scheme to be used
*/
- private static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
+ public static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
- private String charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
- private String xmlVersion = OMConstants.DEFAULT_XML_VERSION;
+ private String charSetEncoding;
+ private String xmlVersion;
private boolean ignoreXMLDeclaration = false;
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java Fri Sep 2 01:55:39 2005
@@ -64,12 +64,14 @@
*/
protected String xmlVersion = "1.0";
+ protected String isStandalone;
+
/**
* Default constructor
*/
public OMDocumentImpl() {
- this.done = true;
+ this.done = true;
}
/**
@@ -247,12 +249,20 @@
/**
* Set the character set encoding scheme
*
- * @param charSetEncoding
+ * @param charEncoding
*/
public void setCharsetEncoding(String charEncoding) {
this.charSetEncoding = charEncoding;
}
+ public String isStandalone() {
+ return isStandalone;
+ }
+
+ public void setStandalone(String isStandalone) {
+ this.isStandalone = isStandalone;
+ }
+
public String getXMLVersion() {
return xmlVersion;
}
@@ -305,11 +315,13 @@
//Check whether the OMOutput char encoding and OMDocument char
//encoding matches, if not use char encoding of OMOutput
String outputCharEncoding = omOutput.getCharSetEncoding();
- if (!outputCharEncoding.equalsIgnoreCase(this.charSetEncoding)) {
- this.charSetEncoding = outputCharEncoding;
+ if (outputCharEncoding == null || "".equals(outputCharEncoding)) {
+ omOutput.getXmlStreamWriter().writeStartDocument(charSetEncoding,
+ xmlVersion);
+ } else {
+ omOutput.getXmlStreamWriter().writeStartDocument(outputCharEncoding,
+ xmlVersion);
}
- omOutput.getXmlStreamWriter().writeStartDocument(charSetEncoding,
- xmlVersion);
}
Iterator children = this.getChildren();
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Fri Sep 2 01:55:39 2005
@@ -16,7 +16,6 @@
package org.apache.axis2.om.impl.llom.builder;
import org.apache.axis2.om.*;
-import org.apache.axis2.soap.impl.llom.SOAPConstants;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -404,5 +403,9 @@
*/
public Object getRegisteredContentHandler() {
throw new UnsupportedOperationException();
+ }
+
+ public OMDocument getDocument() {
+ return document;
}
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Fri Sep 2 01:55:39 2005
@@ -35,7 +35,6 @@
/**
* Field document
*/
- protected OMDocument document;
private boolean doDebug = false;
@@ -198,8 +197,11 @@
lastNode = createOMElement();
break;
case XMLStreamConstants.START_DOCUMENT:
- //Don't do anything in the start document event
- //We've already assumed that start document has passed!
+ // Document has already being created.
+
+ document.setXMLVersion(parser.getVersion());
+ document.setCharsetEncoding(parser.getEncoding());
+ document.setStandalone(parser.isStandalone() ? "yes" : "no");
if(doDebug) {
System.out.println("START_DOCUMENT: ");
}
@@ -317,9 +319,7 @@
}
}
- public OMDocument getDocument() {
- return document;
- }
+
public void setDoDebug(boolean doDebug) {
this.doDebug = doDebug;
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Fri Sep 2 01:55:39 2005
@@ -181,6 +181,8 @@
if (lastNode == null) {
node = constructNode(null, elementName, true);
soapMessage.setSOAPEnvelope((SOAPEnvelope) node);
+ soapMessage.setXMLVersion(parser.getVersion());
+ soapMessage.setCharsetEncoding(parser.getCharacterEncodingScheme());
} else if (lastNode.isComplete()) {
node =
constructNode((OMElement) lastNode.getParent(),
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java Fri Sep 2 01:55:39 2005
@@ -87,13 +87,17 @@
public void testCharsetEncoding() throws XMLStreamException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OMOutputImpl output = new OMOutputImpl(baos,false);
- document.serialize(output);
+ output.ignoreXMLDeclaration(false);
+ document.serialize(output);
output.flush();
-
- String xmlDocument = new String(baos.toByteArray());
-
- assertTrue("Charset declaration missing",-1<xmlDocument.indexOf(encoding) ||
- -1<xmlDocument.indexOf(encoding2));
+
+ String xmlDocument = new String(baos.toByteArray());
+ System.out.println("xmlDocument = " + xmlDocument);
+
+ assertTrue("Charset declaration missing",-1 < xmlDocument.indexOf(encoding) ||
+ -1 < xmlDocument.indexOf(encoding.toLowerCase()) ||
+ -1 < xmlDocument.indexOf(encoding2.toLowerCase()) ||
+ -1 < xmlDocument.indexOf(encoding2));
}
public void testCharsetEncodingUTF_16() throws XMLStreamException {
Modified: webservices/axis2/trunk/java/xdocs/index.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/index.html?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/index.html (original)
+++ webservices/axis2/trunk/java/xdocs/index.html Fri Sep 2 01:55:39 2005
@@ -107,7 +107,7 @@
<li>MTOM/SWA attachments support</li>
<li>SAAJ implementation</li>
</ul>
-<p><b>07 June 2005 - Apache Axis2 Milestone 2 (M2) Released</b> <a href="releases.html#M2">(Download M2)</a><p>Apache Axis2 is starting to take shape, features implemented in this
+<p><b>07 June 2005 - Apache Axis2 Milestone 2 (M2) Released</b> <p>Apache Axis2 is starting to take shape, features implemented in this
second milestone release are:
<ul>
<li>Modules - a mechanism to extend the SOAP Processing Model</li>
@@ -120,7 +120,7 @@
This release also includes tools such as an administraion web application, and three Eclipse
plug-ins: WSDL2WS, Service Archive Wizard, and Module Archive Wizard.</p>
-<p><b>24 February 2005 - Apache Axis2 Milestone 1 (M1) Released</b> <a href="releases.html#M1">(Download M1)</a><p>This first milestone release of Axis2 includes the following features:
+<p><b>24 February 2005 - Apache Axis2 Milestone 1 (M1) Released</b> <p>This first milestone release of Axis2 includes the following features:
<ul>
<li>AXIOM, a SOAP specific streaming XML infoset model for SOAP 1.1/1.2 Messages</li>
<li>WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</li>
Modified: webservices/axis2/trunk/java/xdocs/otherTutorials.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/otherTutorials.html?rev=267164&r1=267163&r2=267164&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/otherTutorials.html (original)
+++ webservices/axis2/trunk/java/xdocs/otherTutorials.html Fri Sep 2 01:55:39 2005
@@ -6,7 +6,7 @@
-->
</style>
<h1>Other Articles and Tutorials</h1>
-<p>This page contains links to articles and totorials on Axis2, published else where .</p>
+<p>This page contains links to articles and tutorials on Axis2, published else where .</p>
<h2>Axis2</h2>
<ul>
<li>
@@ -26,7 +26,7 @@
<h2>AXIOM</h2>
<ul>
<li>
- <p><a href="http://www.jaxmag.com/itr/online_artikel/psecom,id,726,nodeid,147.html">Fast and Lightweight Object Model for XML </a> - A Introduction to AXIOM, the Open Source API for Working with XML </p>
+ <p><a href="http://www.jaxmag.com/itr/online_artikel/psecom,id,726,nodeid,147.html">Fast and Lightweight Object Model for XML </a> - An Introduction to AXIOM, the Open Source API for Working with XML </p>
</li>
</ul>
<p>Some more articles are on the way Axis2 and AXIOM. </p>