You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/08/15 11:04:25 UTC
svn commit: r232776 - in /webservices/axis/trunk/java: ./
modules/integration/test/org/apache/axis2/engine/
modules/xml/src/org/apache/axis2/om/
modules/xml/src/org/apache/axis2/om/impl/llom/ xdocs/
Author: chinthaka
Date: Mon Aug 15 02:03:55 2005
New Revision: 232776
URL: http://svn.apache.org/viewcvs?rev=232776&view=rev
Log:
- adding a method to build OM with MTOM
- changing some docs
Modified:
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
webservices/axis/trunk/java/release-notes.html
webservices/axis/trunk/java/xdocs/axis2tools.html
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Mon Aug 15 02:03:55 2005
@@ -39,24 +39,24 @@
import javax.xml.namespace.QName;
public class EchoRawXMLTest extends TestCase {
- private EndpointReference targetEPR =
+ protected EndpointReference targetEPR =
new EndpointReference("http://127.0.0.1:"
+ (UtilServer.TESTING_PORT)
+ "/axis/services/EchoXMLService/echoOMElement");
- private Log log = LogFactory.getLog(getClass());
- private QName serviceName = new QName("EchoXMLService");
- private QName operationName = new QName("echoOMElement");
- private QName transportName = new QName("http://localhost/my",
+ protected Log log = LogFactory.getLog(getClass());
+ protected QName serviceName = new QName("EchoXMLService");
+ protected QName operationName = new QName("echoOMElement");
+ protected QName transportName = new QName("http://localhost/my",
"NullTransport");
- private AxisConfiguration engineRegistry;
- private MessageContext mc;
+ protected AxisConfiguration engineRegistry;
+ protected MessageContext mc;
//private Thread thisThread;
// private SimpleHTTPServer sas;
- private ServiceContext serviceContext;
- private ServiceDescription service;
+ protected ServiceContext serviceContext;
+ protected ServiceDescription service;
- private boolean finish = false;
+ protected boolean finish = false;
public EchoRawXMLTest() {
super(EchoRawXMLTest.class.getName());
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java Mon Aug 15 02:03:55 2005
@@ -207,4 +207,10 @@
*/
public void build();
+ /**
+ * The build method will not read the information from stream and build MTOM stuff.
+ * This method is to build the normal model and force build the MTOM stuff too.
+ * @throws OMException
+ */
+ public void buildWithMTOM() throws OMException;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Mon Aug 15 02:03:55 2005
@@ -49,7 +49,7 @@
/**
* Field namespaces
- */
+ */
protected HashMap namespaces = null;
/**
@@ -65,11 +65,6 @@
/**
* Constructor OMElementImpl
- *
- * @param localName
- * @param ns
- * @param parent
- * @param builder
*/
public OMElementImpl(String localName, OMNamespace ns, OMContainer parent,
OMXMLParserWrapper builder) {
@@ -85,9 +80,6 @@
/**
* Constructor OMElementImpl
- *
- * @param localName
- * @param ns
*/
public OMElementImpl(String localName, OMNamespace ns) {
this(localName, ns, null);
@@ -98,8 +90,8 @@
* will depend on this.
*
* @param localName - this MUST always be not null
- * @param ns - can be null
- * @param parent - this should be an OMContainer
+ * @param ns - can be null
+ * @param parent - this should be an OMContainer
*/
public OMElementImpl(String localName, OMNamespace ns, OMContainer parent) {
super(parent);
@@ -117,18 +109,15 @@
* Here it is assumed that this QName passed, at least contains the localName for this element
*
* @param qname - this should be valid qname according to javax.xml.namespace.QName
- * @param parent
* @throws OMException
*/
public OMElementImpl(QName qname, OMContainer parent) throws OMException {
- this(qname.getLocalPart(), null, parent);
+ this(qname.getLocalPart(), null, parent);
this.ns = handleNamespace(qname);
}
/**
* Method handleNamespace
- *
- * @param qname
*/
private OMNamespace handleNamespace(QName qname) {
OMNamespace ns = null;
@@ -157,8 +146,8 @@
if (ns != null) {
this.ns = (ns);
}
- }else{
- // no namespace URI in the given QName. No need to bother about this ??
+ } else {
+ // no namespace URI in the given QName. No need to bother about this ??
}
return ns;
@@ -167,7 +156,6 @@
/**
* Method handleNamespace
*
- * @param ns
* @return namespace
*/
private OMNamespace handleNamespace(OMNamespace ns) {
@@ -182,8 +170,6 @@
/**
* This will add child to the element. One can decide whether he append the child or he adds to the
* front of the children list
- *
- * @param child
*/
public void addChild(OMNode child) {
addChild((OMNodeImpl) child);
@@ -194,8 +180,6 @@
* the OMNodes.
* This QName can contain any combination of prefix, localname and URI
*
- * @param elementQName
- * @return
* @throws org.apache.axis2.om.OMException
*
* @throws OMException
@@ -208,8 +192,6 @@
/**
* Method getFirstChildWithName
*
- * @param elementQName
- * @return
* @throws OMException
*/
public OMElement getFirstChildWithName(QName elementQName) throws OMException {
@@ -228,8 +210,6 @@
/**
* Method addChild
- *
- * @param child
*/
private void addChild(OMNodeImpl child) {
if (firstChild == null) {
@@ -248,7 +228,6 @@
/**
* This will give the next sibling. This can be an OMAttribute for OMAttribute or OMText or OMELement for others.
*
- * @return
* @throws org.apache.axis2.om.OMException
*
* @throws OMException
@@ -282,8 +261,6 @@
/**
* THis will create a namespace in the current element scope
*
- * @param uri
- * @param prefix
* @return namespace
*/
public OMNamespace declareNamespace(String uri, String prefix) {
@@ -293,7 +270,6 @@
/**
- * @param namespace
* @return namespace
*/
public OMNamespace declareNamespace(OMNamespace namespace) {
@@ -309,9 +285,6 @@
* This will start to find from the current element and goes up in the hiararchy until this finds one.
* If none is found, return null
*
- * @param uri
- * @param prefix
- * @return
* @throws org.apache.axis2.om.OMException
*
* @throws OMException
@@ -341,9 +314,6 @@
* This will ckeck for the namespace <B>only</B> in the current Element
* This can also be used to retrieve the prefix of a known namespace URI
*
- * @param uri
- * @param prefix
- * @return
* @throws OMException
*/
private OMNamespace findDeclaredNamespace(String uri, String prefix)
@@ -381,8 +351,6 @@
/**
* This will help to search for an attribute with a given QName within this Element
*
- * @param qname
- * @return
* @throws org.apache.axis2.om.OMException
*
* @throws OMException
@@ -413,14 +381,13 @@
* @return an OMAttribute with the given name if found, or null
*/
public OMAttribute getAttribute(QName qname) {
- return (OMAttribute)attributes.get(qname);
+ return (OMAttribute) attributes.get(qname);
}
/**
* This will insert attribute to this element. Implementor can decide as to insert this
* in the front or at the end of set of attributes
*
- * @param attr
* @return attribute
*/
public OMAttribute addAttribute(OMAttribute attr) {
@@ -433,8 +400,6 @@
/**
* Method removeAttribute
- *
- * @param attr
*/
public void removeAttribute(OMAttribute attr) {
if (attributes != null) {
@@ -445,9 +410,6 @@
/**
* Method addAttribute
*
- * @param attributeName
- * @param value
- * @param ns
* @return attribute
*/
public OMAttribute addAttribute(String attributeName, String value,
@@ -469,8 +431,6 @@
/**
* Method setBuilder
- *
- * @param wrapper
*/
public void setBuilder(OMXMLParserWrapper wrapper) {
this.builder = wrapper;
@@ -506,8 +466,6 @@
/**
* Method setFirstChild
- *
- * @param firstChild
*/
public void setFirstChild(OMNode firstChild) {
if (firstChild != null) {
@@ -553,7 +511,6 @@
/**
* This is to get the type of node, as this is the super class of all the nodes
*
- * @return
* @throws org.apache.axis2.om.OMException
*
* @throws OMException
@@ -565,7 +522,6 @@
/**
* getXMLStreamReader
*
- * @return
* @see org.apache.axis2.om.OMElement#getXMLStreamReader()
*/
public XMLStreamReader getXMLStreamReader() {
@@ -575,7 +531,6 @@
/**
* getXMLStreamReaderWithoutCaching
*
- * @return
* @see org.apache.axis2.om.OMElement#getXMLStreamReaderWithoutCaching()
*/
public XMLStreamReader getXMLStreamReaderWithoutCaching() {
@@ -585,7 +540,6 @@
/**
* getXMLStreamReader
*
- * @param cache
* @return reader
*/
private XMLStreamReader getXMLStreamReader(boolean cache) {
@@ -600,8 +554,6 @@
* Sets the text of the given element.
* caution - This method will wipe out all the text elements (and hence any
* moxed content) before setting the text
- *
- * @param text
*/
public void setText(String text) {
@@ -639,12 +591,11 @@
return childText;
}
-
+
/**
- * Returns the concatanation of TRIMMED values of all
+ * Returns the concatanation of TRIMMED values of all
* OMText child nodes of this element
* This is incuded purely to improve usability
- * @return
*/
public String getTrimmedText() {
String childText = "";
@@ -668,7 +619,6 @@
/**
* Method serializeWithCache
*
- * @param omOutput
* @throws XMLStreamException
*/
public void serializeWithCache(OMOutputImpl omOutput) throws XMLStreamException {
@@ -740,7 +690,6 @@
* cause loss of data.So its advised to use populateYourSelf() method, before this,
* if you want to preserve data in the stream.
*
- * @param omOutput
* @throws XMLStreamException
*/
public void serialize(org.apache.axis2.om.impl.OMOutputImpl omOutput) throws XMLStreamException {
@@ -785,8 +734,6 @@
/**
* Method setLocalName
- *
- * @param localName
*/
public void setLocalName(String localName) {
this.localName = localName;
@@ -795,7 +742,6 @@
/**
* Method getNamespace
*
- * @return
* @throws OMException
*/
public OMNamespace getNamespace() throws OMException {
@@ -805,8 +751,6 @@
/**
* Method setNamespace
- *
- * @param namespace
*/
public void setNamespace(OMNamespace namespace) {
OMNamespace nsObject = null;
@@ -845,6 +789,16 @@
this.detach();
} else {
builder.discard(this);
+ }
+ }
+
+ public void buildWithMTOM() throws OMException {
+ if (!done) {
+ this.build();
+ }
+ Iterator childrenIterator = this.getChildren();
+ while (childrenIterator.hasNext()) {
+ ((OMNode) childrenIterator.next()).buildWithMTOM();
}
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java Mon Aug 15 02:03:55 2005
@@ -285,6 +285,16 @@
}
}
+ /**
+ * The build method will not read the information from stream and build MTOM stuff.
+ * This method is to build the normal model and force build the MTOM stuff too.
+ * @throws OMException
+ */
+ public void buildWithMTOM() throws OMException{
+
+ }
+
+
/**
@@ -336,4 +346,5 @@
public void serialize(OMOutputImpl omOutput) throws XMLStreamException {
throw new RuntimeException("Not implemented yet!");
}
+
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java Mon Aug 15 02:03:55 2005
@@ -421,4 +421,8 @@
builder.discard((OMElement) this.parent);
}
}
+
+ public void buildWithMTOM() throws OMException {
+ this.getDataHandler();
+ }
}
Modified: webservices/axis/trunk/java/release-notes.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/release-notes.html?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/release-notes.html (original)
+++ webservices/axis/trunk/java/release-notes.html Mon Aug 15 02:03:55 2005
@@ -13,7 +13,7 @@
<li>Support for One-Way Messaging and Request Response Messaging</li>
<li>Modules, mechanism to extend the SOAP Processing Model</li>
<li>Archives based deployment Model </li>
- <li>WSDL Code Generation Tool for Stub and skeletons</li>
+ <li>WSDL Code Generation Tool for Stub and skeltons</li>
<li>XML Beans based data binding support</li>
<li>Support for WS-Addressing, both the submission and final versions</li>
<li>Client API</li>
@@ -23,8 +23,15 @@
<li>TCP transport Support</li>
<li>MTOM/SWA attachments support</li>
<li>SAAJ implementation</li>
- <li>Numerous bug fixes </li>
</ul>
+
+<p>The release include following tools</p>
+<ol>
+ <LI>Admin Web App</LI>
+ <LI>WSDL2WS, eclipe Plugin/Command line version</LI>
+ <LI>Service Archive Wizard, eclipe Plugin</LI>
+ <LI>Module Archive Wizard, eclipe Plugin</LI>
+</ol>
<h2>What's still to do?</h2>
Modified: webservices/axis/trunk/java/xdocs/axis2tools.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/xdocs/axis2tools.html?rev=232776&r1=232775&r2=232776&view=diff
==============================================================================
--- webservices/axis/trunk/java/xdocs/axis2tools.html (original)
+++ webservices/axis/trunk/java/xdocs/axis2tools.html Mon Aug 15 02:03:55 2005
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<title>Untitled Document</title>
+<title>Axis2 tools</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>