axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r395894 - in /webservices/axis2/trunk/java: modules/adb/src/org/apache/axis2/databinding/utils/reader/ modules/adb/test/org/apache/axis2/databinding/ modules/core/src/org/apache/axis2/client/ xdocs/latest/
Date Fri, 21 Apr 2006 14:11:17 GMT
Author: chinthaka
Date: Fri Apr 21 07:11:15 2006
New Revision: 395894

URL: http://svn.apache.org/viewcvs?rev=395894&view=rev
Log:
- Fixing userguide - Part 1
- Fixing Options in handling RelatesTo so that now it will pick up even the Submission default
relationshiptype value also.
- changes to be sync with latest Axiom changes

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
    webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
    webservices/axis2/trunk/java/xdocs/latest/userguide1.html

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=395894&r1=395893&r2=395894&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Fri Apr 21 07:11:15 2006
@@ -6,12 +6,12 @@
 import org.apache.axis2.databinding.ADBBean;
 import org.apache.axis2.databinding.utils.BeanUtil;
 
+import javax.activation.DataHandler;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.activation.DataHandler;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -696,7 +696,8 @@
         } else if (state==TEXT_STATE) {
             return null;
         }else{
-            return elementQName.getPrefix();
+            String prefix = elementQName.getPrefix();
+            return "".equals(prefix) ? null : prefix ;
         }
     }
 

Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java?rev=395894&r1=395893&r2=395894&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
(original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ADBSOAPModelBuilderTest.java
Fri Apr 21 07:11:15 2006
@@ -91,7 +91,7 @@
     }
 
     public void testConvertToDOOM() throws Exception {
-        String xml = "<?xml version='1.0' encoding='utf-8'?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"><soapenv:Header
/><soapenv:Body><ns1:createAccountRequest xmlns:ns1=\"http://www.wso2.com/types\"><ns1:clientinfo
xmlns=\"http://www.wso2.com/types\"><name xmlns=\"\">bob</name><ssn xmlns=\"\">123456789</ssn></ns1:clientinfo><password
xmlns=\"\">passwd</password></ns1:createAccountRequest></soapenv:Body></soapenv:Envelope>";
+        String xml = "<?xml version='1.0' encoding='utf-8'?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"><soapenv:Header
/><soapenv:Body><ns1:createAccountRequest xmlns:ns1=\"http://www.wso2.com/types\"><clientinfo
xmlns=\"http://www.wso2.com/types\"><name>bob</name><ssn>123456789</ssn></clientinfo><password
xmlns=\"\">passwd</password></ns1:createAccountRequest></soapenv:Body></soapenv:Envelope>";
 
         StAXSOAPModelBuilder builder2 = new StAXSOAPModelBuilder(getTestEnvelope().getXMLStreamReader(),
DOOMAbstractFactory.getSOAP11Factory(), SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         SOAPEnvelope envelope = builder2.getSOAPEnvelope();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=395894&r1=395893&r2=395894&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Fri
Apr 21 07:11:15 2006
@@ -199,7 +199,9 @@
         for(int i=0;relationships != null && i<relationships.size();i++) {
             RelatesTo relatesTo = (RelatesTo) relationships.get(i);
             String relationshipType = relatesTo.getRelationshipType();
-            if(type.equals(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE) &&
relationshipType == null) {
+            if((type.equals(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE) ||
+                    type.equals(AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE))
+                    && relationshipType == null) {
                 return relatesTo;
             }
             if(relationshipType != null && relationshipType.equals(type)) {
@@ -214,7 +216,20 @@
      * @return the relates to which has the type http://www.w3.org/2005/08/addressing/reply
      */
     public RelatesTo getRelatesTo() {
-       return this.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE);
+        if (relationships == null && parent != null) {
+            return parent.getRelatesTo();
+        }
+        for(int i=0;relationships != null && i<relationships.size();i++) {
+            RelatesTo relatesTo = (RelatesTo) relationships.get(i);
+            String relationshipType = relatesTo.getRelationshipType();
+            if(relationshipType == null) {
+                return relatesTo;
+            }else if (relationshipType.equals(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE)
+                    || relationshipType.equals(AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE))
{
+                return relatesTo;
+            }
+        }
+        return null;
     }
 
     public RelatesTo[] getRelationships() {

Modified: webservices/axis2/trunk/java/xdocs/latest/userguide1.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/latest/userguide1.html?rev=395894&r1=395893&r2=395894&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/latest/userguide1.html (original)
+++ webservices/axis2/trunk/java/xdocs/latest/userguide1.html Fri Apr 21 07:11:15 2006
@@ -99,8 +99,8 @@
     is completely transport-independent.</p>
   </li>
   <li><p style="margin-bottom: 0in"><strong>WSDL support</strong>
- Axis2
-    supports the <a href="http://www.w3.org/TR/wsdl" target="_blank">Web Service Description
-    Language</a>, version 1.1 and 2.0, which allows you to easily build stubs
+    supports the Web Service Description
+    Language, version <a href="http://www.w3.org/TR/wsdl">1.1</a> and <a href="http://www.w3.org/TR/wsdl20/">2.0</a>,
which allows you to easily build stubs
     to access remote services, and also to automatically export
     machine-readable descriptions of your deployed services from Axis2.</p>
   </li>
@@ -205,20 +205,6 @@
     IDEA plugin</a>--></li>
 </ol>
 <p><a href="http://ws.apache.org/axis2/download.cgi" target="_blank">Download</a>
above plugins</p>
-
-<h3><a name="What's_still_to_do_">What's Still To Do?</a></h3>
-
-<p>See list of what we think needs to be done, and consider helping out if
-you're interested &amp; able!</p>
-<ol type="1">
- <li>JAX-RPC 1.1 and/or JAX-WS compliance</li>
- <li>SOAP Encoding</li>
- <li>Binary serialization and de-serialization support</li>
- <li>Management Interface for Axis2</li>
- <li>Implementation of other Transports.</li>
- <li>Resource framework implementation (WS-RF) and Enterprise web services such as
JSR 109 support</li>
- <li>Completion of Interop tests</li>
-</ol>
 
 <p align="right"><a href="userguide.html"><img
 src="images/arrow_left.gif"> Previous</a> | <a href="userguide2.html">Next
<img src="images/arrow_right.gif"></a></p>



Mime
View raw message