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 gd...@apache.org on 2005/08/30 14:29:41 UTC

svn commit: r264768 - in /webservices/axis/trunk/java/modules/xml/src/org/apache/axis2: om/impl/llom/OMStAXWrapper.java om/impl/llom/serialize/StreamingOMSerializer.java soap/impl/llom/SOAPFaultImpl.java

Author: gdaniels
Date: Tue Aug 30 05:29:37 2005
New Revision: 264768

URL: http://svn.apache.org/viewcvs?rev=264768&view=rev
Log:
* Initial getAttributeValue() impl

* Slightly more info for illegal state error

* Allow non-namespaced elements in StreamingOMSerializer

* Include stack trace in SOAP faults for now to aid debugging

Modified:
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java?rev=264768&r1=264767&r2=264768&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java Tue Aug 30 05:29:37 2005
@@ -617,7 +617,8 @@
                 returnCount = getCount(elt.getAttributes());
             } else {
                 throw new IllegalStateException(
-                        "attribute count accessed in illegal event!");
+                        "attribute count accessed in illegal event (" +
+                        currentEvent + ")!");
             }
         }
         return returnCount;
@@ -633,7 +634,22 @@
      * @return
      */
     public String getAttributeValue(String s, String s1) {
-        throw new UnsupportedOperationException();
+        String returnString = null;
+        if (parser != null) {
+            returnString = parser.getAttributeValue(s, s1);
+        } else {
+            if (isStartElement() || (currentEvent == ATTRIBUTE)) {
+                QName qname = new QName(s, s1);
+                OMAttribute attrib = ((OMElement)lastNode).getAttribute(qname);
+                if (attrib != null) {
+                    returnString = attrib.getValue();
+                }
+            } else {
+                throw new IllegalStateException(
+                        "attribute type accessed in illegal event!");
+            }
+        }
+        return returnString;
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java?rev=264768&r1=264767&r2=264768&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java Tue Aug 30 05:29:37 2005
@@ -134,8 +134,7 @@
                 }
             }
         } else {
-//            throw new OMException(
-//                    "Non namespace qualified elements are not allowed");
+            writer.writeStartElement(reader.getLocalName());
         }
 
         // add attributes

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=264768&r1=264767&r2=264768&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Tue Aug 30 05:29:37 2005
@@ -26,6 +26,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import java.io.StringWriter;
+import java.io.PrintWriter;
 import java.util.Iterator;
 
 /**
@@ -136,7 +137,8 @@
 
     protected void putExceptionToSOAPFault(Exception e) throws SOAPProcessingException {
         StringWriter sw = new StringWriter();
-        sw.write(e.getMessage());
+//        sw.write(e.getMessage());
+        e.printStackTrace(new PrintWriter(sw));
         sw.flush();
         getDetail();
         if (getDetail() == null) {