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/03/16 04:50:45 UTC
svn commit: r157638 - in webservices/axis/trunk/java/modules:
core/src/java/org/apache/axis/engine/Dispatcher.java
om/src/java/org/apache/axis/om/OMElement.java
om/src/java/org/apache/axis/om/OMNamedNode.java
om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
Author: chinthaka
Date: Tue Mar 15 19:50:44 2005
New Revision: 157638
URL: http://svn.apache.org/viewcvs?view=rev&rev=157638
Log:
Fixing the build and some more on OM
Modified:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMElement.java
webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMNamedNode.java
webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&r1=157637&r2=157638
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java Tue Mar 15 19:50:44 2005
@@ -15,8 +15,6 @@
*/
package org.apache.axis.engine;
-import javax.xml.namespace.QName;
-
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
@@ -25,6 +23,8 @@
import org.apache.axis.handlers.AbstractHandler;
import org.apache.wsdl.WSDLService;
+import javax.xml.namespace.QName;
+
/**
* Class Dispatcher
*/
@@ -78,8 +78,10 @@
if (WSDLService.STYLE_DOC.equals(msgctx.getMessageStyle())) {
String soapAction = (String) msgctx.getProperty(MessageContext.SOAP_ACTION);
- soapAction = soapAction.replace('"',' ').trim();
-
+ if (soapAction != null) {
+ soapAction = soapAction.replace('"', ' ').trim();
+ }
+
if (soapAction != null && soapAction.trim().length() > 0) {
QName operationName = new QName(soapAction);
AxisOperation op = service.getOperation(operationName);
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=157637&r2=157638
==============================================================================
--- 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 Tue Mar 15 19:50:44 2005
@@ -206,4 +206,6 @@
* @return
*/
public String getText();
+
+
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMNamedNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMNamedNode.java?view=diff&r1=157637&r2=157638
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMNamedNode.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMNamedNode.java Tue Mar 15 19:50:44 2005
@@ -15,6 +15,8 @@
*/
package org.apache.axis.om;
+import javax.xml.namespace.QName;
+
/**
* Interface OMNamedNode
*/
@@ -54,4 +56,6 @@
* @param namespace
*/
public void setNamespace(OMNamespace namespace);
+
+ public QName getQName();
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java?view=diff&r1=157637&r2=157638
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java Tue Mar 15 19:50:44 2005
@@ -15,15 +15,7 @@
*/
package org.apache.axis.om.impl.llom;
-import org.apache.axis.om.OMAttribute;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMNode;
-import org.apache.axis.om.OMText;
-import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.*;
import org.apache.axis.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axis.om.impl.llom.serialize.StreamingOMSerializer;
import org.apache.axis.om.impl.llom.traverse.OMChildrenIterator;
@@ -398,7 +390,21 @@
*/
public Iterator getAttributes() {
if (attributes == null) {
- return null;
+ return new Iterator(){
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+
+ }
+
+ public boolean hasNext() {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Object next() {
+ throw new UnsupportedOperationException();
+ }
+ };
}
return attributes.values().iterator();
}
@@ -563,10 +569,8 @@
String childText = "";
OMNode child = this.getFirstChild();
while(child != null){
- String value = child.getValue();
- System.out.println("value.length() = " + value.length());
- if(child.getType() == OMNode.TEXT_NODE && value != null && !"".equals(value.trim())){
- childText += value.trim();
+ if(child.getType() == OMNode.TEXT_NODE && child.getValue() != null && !"".equals(child.getValue().trim())){
+ childText += child.getValue().trim();
}
child = child.getNextSibling();
}
@@ -834,6 +838,10 @@
}
}
return null;
+ }
+
+ public QName getQName() {
+ return super.getQName(); //To change body of overridden methods use File | Settings | File Templates.
}
}