axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r482576 - in /webservices/axis2/branches/java/WSDL_2_0/modules: adb-codegen/src/org/apache/axis2/schema/template/ codegen/src/org/apache/axis2/wsdl/codegen/emitter/ kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/transp...
Date Tue, 05 Dec 2006 10:33:44 GMT
Author: amilas
Date: Tue Dec  5 02:33:43 2006
New Revision: 482576

URL: http://svn.apache.org/viewvc?view=rev&rev=482576
Log:
Added the adb codegen support for wsdl 2.0 any type elements 

Modified:
    webservices/axis2/branches/java/WSDL_2_0/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
    webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
    webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?view=diff&rev=482576&r1=482575&r2=482576
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
Tue Dec  5 02:33:43 2006
@@ -21,6 +21,9 @@
                                         <xsl:value-of select="@type"/>.MY_QNAME,
                                         org.apache.axiom.om.OMAbstractFactory.getOMFactory());
                     </xsl:when>
+                    <xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
+                     return param; 
+                    </xsl:when>
                     <xsl:otherwise>
                      return param.getOMElement(<xsl:value-of select="@type"/>.MY_QNAME,
                                   org.apache.axiom.om.OMAbstractFactory.getOMFactory());
@@ -105,6 +108,9 @@
                                         param,
                                         <xsl:value-of select="$inputElementType"/>.MY_QNAME,factory));
                                     </xsl:when>
+                                    <xsl:when test="$inputElementType = 'org.apache.axiom.om.OMElement'">
+                                        emptyEnvelope.getBody().addChild(param);
+                                     </xsl:when>
                                     <xsl:otherwise>
                                         emptyEnvelope.getBody().addChild(param.getOMElement(<xsl:value-of
select="$inputElementType"/>.MY_QNAME,factory));
                                     </xsl:otherwise>
@@ -276,6 +282,9 @@
                 <xsl:choose>
                     <xsl:when test="$helpermode">
                            return <xsl:value-of select="@type"/>Helper.parse(param.getXMLStreamReaderWithoutCaching());
+                    </xsl:when>
+                    <xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
+                           return param;
                     </xsl:when>
                     <xsl:otherwise>
                            return <xsl:value-of select="@type"/>.Factory.parse(param.getXMLStreamReaderWithoutCaching());

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=482576&r1=482575&r2=482576
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Tue Dec  5 02:33:43 2006
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.neethi.Policy;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.woden.internal.util.dom.DOM2Writer;
 //import org.apache.woden.internal.util.dom.DOM2Writer;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -124,7 +125,7 @@
         //populate the MEP -> suffix map
         mepToSuffixMap = new HashMap();
         mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY, MESSAGE_RECEIVER_SUFFIX
+ "InOnly");
-        mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY, MESSAGE_RECEIVER_SUFFIX
+ "InOnly");
+        mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY, MESSAGE_RECEIVER_SUFFIX
+ "RobustInOnly");
         mepToSuffixMap.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT, MESSAGE_RECEIVER_SUFFIX
+ "InOut");
         //register the other types as necessary
     }

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=482576&r1=482575&r2=482576
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Tue Dec  5 02:33:43 2006
@@ -856,7 +856,7 @@
             elementQName = messageReference.getElementDeclaration().getName();
         } else if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_ANY.equals(messageContentModelName))
{
             // TODO : Need to improve this
-//           elementQName = SchemaConstants.XSD_ANY;
+           elementQName = Constants.XSD_ANY;
         } else
         if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_NONE.equals(messageContentModelName))
{
             // TODO : Need to improve this

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java?view=diff&rev=482576&r1=482575&r2=482576
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java
Tue Dec  5 02:33:43 2006
@@ -241,7 +241,7 @@
     }
 
     private void sendViaPost(MessageContext msgContext, OMElement dataout, URL url,
-                             String soapActionString) {
+                             String soapActionString) throws MalformedURLException {
 
         // execute the HtttpMethodBase - a connection manager can be given for
         // handle multiple



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message