You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by ct...@apache.org on 2008/12/12 16:09:24 UTC
svn commit: r726027 [2/2] - in /webservices/muse/trunk/modules:
muse-core/src/org/apache/muse/core/descriptor/
muse-core/src/org/apache/muse/core/proxy/
muse-core/src/org/apache/muse/core/routing/
muse-core/src/org/apache/muse/core/serializer/ muse-cor...
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/SimpleMetadataDescriptor.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/SimpleMetadataDescriptor.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/SimpleMetadataDescriptor.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/SimpleMetadataDescriptor.java Fri Dec 12 07:09:22 2008
@@ -434,7 +434,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/WsrmdUtils.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/WsrmdUtils.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/WsrmdUtils.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/metadata/impl/WsrmdUtils.java Fri Dec 12 07:09:22 2008
@@ -52,7 +52,7 @@
public static Element createMetadataDocument(MetadataDescriptor rmd)
{
Element root = XmlUtils.createElement(WsrmdConstants.DEFINITIONS_QNAME);
- Element rmdXML = rmd.toXML();
+ Element rmdXML = rmd.toXML(root.getOwnerDocument());
root.appendChild(rmdXML);
return root;
}
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleRequest.java Fri Dec 12 07:09:22 2008
@@ -111,7 +111,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleResponse.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetMultipleResponse.java Fri Dec 12 07:09:22 2008
@@ -103,7 +103,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetRequest.java Fri Dec 12 07:09:22 2008
@@ -85,7 +85,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetResponse.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/get/impl/GetResponse.java Fri Dec 12 07:09:22 2008
@@ -109,7 +109,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java Fri Dec 12 07:09:22 2008
@@ -20,17 +20,13 @@
package org.apache.muse.ws.resource.properties.impl;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.QName;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.apache.muse.util.MultiMap;
import org.apache.muse.util.messages.Messages;
import org.apache.muse.util.messages.MessagesFactory;
@@ -61,6 +57,9 @@
import org.apache.muse.ws.resource.properties.set.impl.InsertRequest;
import org.apache.muse.ws.resource.properties.set.impl.SimpleSetRequest;
import org.apache.muse.ws.resource.properties.set.impl.UpdateRequest;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
*
@@ -887,14 +886,11 @@
*/
private Element stripWhiteSpaceChildren(Element root)
{
- NodeList children = root.getChildNodes();
-
- for (int i = 0; i < children.getLength(); i++)
- {
- Node child = children.item(i);
-
+ XmlUtils.NodeChildrenIterator itr = new XmlUtils.NodeChildrenIterator(root);
+ while(itr.hasNext()) {
+ Node child = itr.next();
if (child.getNodeType() == Node.TEXT_NODE && child.getNodeValue().trim().equals(""))
- child.getParentNode().removeChild(child);
+ itr.remove();
}
return root;
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryRequest.java Fri Dec 12 07:09:22 2008
@@ -109,7 +109,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryResponse.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/query/impl/QueryResponse.java Fri Dec 12 07:09:22 2008
@@ -96,7 +96,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/DeleteRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/DeleteRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/DeleteRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/DeleteRequest.java Fri Dec 12 07:09:22 2008
@@ -90,7 +90,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/InsertRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/InsertRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/InsertRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/InsertRequest.java Fri Dec 12 07:09:22 2008
@@ -127,7 +127,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/SimpleSetRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/SimpleSetRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/SimpleSetRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/SimpleSetRequest.java Fri Dec 12 07:09:22 2008
@@ -77,7 +77,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/UpdateRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/UpdateRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/UpdateRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/set/impl/UpdateRequest.java Fri Dec 12 07:09:22 2008
@@ -101,7 +101,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/remote/WsResourceClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/remote/WsResourceClient.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/remote/WsResourceClient.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/remote/WsResourceClient.java Fri Dec 12 07:09:22 2008
@@ -164,7 +164,7 @@
public Element putResourcePropertyDocument(Element wsrpDoc)
throws SoapFault
{
- Element request = XmlUtils.createElement(XmlUtils.EMPTY_DOC, WsrpConstants.PUT_DOCUMENT_QNAME, wsrpDoc, false);
+ Element request = XmlUtils.createElement(XmlUtils.createDocument(), WsrpConstants.PUT_DOCUMENT_QNAME, wsrpDoc, false);
Element response = invoke(WsrpConstants.PUT_RP_DOCUMENT_URI, request);
return XmlUtils.getFirstElement(response);
}
@@ -176,8 +176,7 @@
Element response = invoke(WsrpConstants.QUERY_RESOURCE_PROPERTIES_URI, request.toXML());
- NodeList children = response.getChildNodes();
- return XmlUtils.convertToArray(children);
+ return XmlUtils.convertToArray(response);
}
public void setResourceProperties(SetRequest request)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddRequest.java Fri Dec 12 07:09:22 2008
@@ -127,7 +127,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document factory)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddResponse.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/AddResponse.java Fri Dec 12 07:09:22 2008
@@ -122,7 +122,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleEntry.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleEntry.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleEntry.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleEntry.java Fri Dec 12 07:09:22 2008
@@ -164,7 +164,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleMembershipContentRule.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleMembershipContentRule.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleMembershipContentRule.java (original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/sg/impl/SimpleMembershipContentRule.java Fri Dec 12 07:09:22 2008
@@ -169,7 +169,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document factory)
Modified: webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataRequest.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataRequest.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataRequest.java (original)
+++ webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataRequest.java Fri Dec 12 07:09:22 2008
@@ -60,7 +60,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)
Modified: webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataResponse.java?rev=726027&r1=726026&r2=726027&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsx-impl/src/org/apache/muse/ws/metadata/impl/GetMetadataResponse.java Fri Dec 12 07:09:22 2008
@@ -66,7 +66,7 @@
public Element toXML()
{
- return toXML(XmlUtils.EMPTY_DOC);
+ return toXML(XmlUtils.createDocument());
}
public Element toXML(Document doc)