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 ru...@apache.org on 2005/10/24 06:35:16 UTC
svn commit: r327961 - in /webservices/axis2/trunk/java/modules:
security/src/org/apache/axis2/security/
security/src/org/apache/axis2/security/util/
xml/src/org/apache/axis2/om/impl/dom/
xml/src/org/apache/axis2/om/impl/llom/traverse/ xml/test/org/apac...
Author: ruchithf
Date: Sun Oct 23 21:34:55 2005
New Revision: 327961
URL: http://svn.apache.org/viewcvs?rev=327961&view=rev
Log:
- Removed llom specific casting in OMChildrenQNameIterator to reuse it in the OM-DOM impl
- Cleaned up the Om serialization and building in the security handlers
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/ParentNode.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/dom/ElementImplTest.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=327961&r1=327960&r2=327961&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Sun Oct 23 21:34:55 2005
@@ -193,15 +193,13 @@
if(preserveOriginalEnvelope) {
processedEnv = Axis2Util.getSOAPEnvelopeFromDocument(doc,reqData.getSoapConstants(), msgContext.getEnvelope());
+ // msgContext.getEnvelope().build();
} else {
processedEnv = Axis2Util.getSOAPEnvelopeFromDocument(doc, reqData.getSoapConstants().getEnvelopeURI());
}
msgContext.setEnvelope(processedEnv);
((MessageContext)reqData.getMsgContext()).setProperty(WSHandlerConstants.SND_SECURITY, null);
}
-
- msgContext.getEnvelope().build();
-
/**
* If the optimizeParts parts are set then optimize them
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java?rev=327961&r1=327960&r2=327961&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java Sun Oct 23 21:34:55 2005
@@ -52,13 +52,12 @@
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- env.build();
/**
* There are plans to deprecate the OmNode.serializeAndConsume(XMLStreamWriter)
* method therefore using OMOutoutImpl to serializeAndConsume the env
*/
OMOutputImpl output = new OMOutputImpl(baos, false);
- env.serializeAndConsume(output);
+ env.serialize(output);
output.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/ParentNode.java?rev=327961&r1=327960&r2=327961&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/ParentNode.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/dom/ParentNode.java Sun Oct 23 21:34:55 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.impl.OMContainerEx;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
+import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -69,9 +70,8 @@
}
public Iterator getChildrenWithName(QName elementQName) throws OMException {
- // TODO Cannot use OMChildrenQNameIterator since it uses llom.ElementImpl
- // TODO
- throw new UnsupportedOperationException("TODO");
+ return new OMChildrenQNameIterator(getFirstOMChild(),
+ elementQName);
}
public OMElement getFirstChildWithName(QName elementQName)
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java?rev=327961&r1=327960&r2=327961&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java Sun Oct 23 21:34:55 2005
@@ -16,8 +16,8 @@
package org.apache.axis2.om.impl.llom.traverse;
+import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.impl.llom.OMElementImpl;
import javax.xml.namespace.QName;
@@ -63,9 +63,9 @@
if (currentChild != null) {
// check the current node for the criteria
- if ((currentChild instanceof OMElementImpl)
+ if ((currentChild instanceof OMElement)
&& (isQNamesMatch(
- ((OMElementImpl) currentChild).getQName(),
+ ((OMElement) currentChild).getQName(),
this.givenQName))) {
isMatchingNodeFound = true;
needToMoveForward = false;
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/dom/ElementImplTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/dom/ElementImplTest.java?rev=327961&r1=327960&r2=327961&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/dom/ElementImplTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/dom/ElementImplTest.java Sun Oct 23 21:34:55 2005
@@ -22,6 +22,9 @@
import org.w3c.dom.Text;
import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
import junit.framework.TestCase;
@@ -59,7 +62,6 @@
String textToAppend = " followed by another";
OMElement elem = factory.createOMElement(localName,namespace,prefix);
- elem.getLocalName();
OMText textNode = factory.createText(elem,tempText);
((Text)textNode).appendData(textToAppend);
@@ -76,5 +78,27 @@
}
}
-
+ public void testAddChild() {
+ OMDOMFactory factory = new OMDOMFactory();
+ String localName = "TestLocalName";
+ String childLocalName = "TestChildLocalName";
+ String namespace = "http://ws.apache.org/axis2/ns";
+ String prefix = "axis2";
+
+ OMElement elem = factory.createOMElement(localName,namespace,prefix);
+ OMElement childElem = factory.createOMElement(childLocalName,namespace, prefix);
+
+ elem.addChild(childElem);
+
+ Iterator it = elem.getChildrenWithName(new QName(namespace, childLocalName));
+
+ int count = 0;
+ while (it.hasNext()) {
+ OMElement child = (OMElement) it.next();
+ assertEquals("Child local name mismatch", childLocalName, child.getLocalName());
+ assertEquals("Child namespace mismatch", namespace, child.getNamespace().getName());
+ count ++;
+ }
+ assertEquals("In correct number of children", 1, count );
+ }
}