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 di...@apache.org on 2007/07/03 00:44:44 UTC

svn commit: r552617 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/template/java/ jaxbri/ jaxbri/src/org/apache/axis2/jaxbri/template/ jaxbri/test-resources/wsdl/

Author: dims
Date: Mon Jul  2 15:44:43 2007
New Revision: 552617

URL: http://svn.apache.org/viewvc?view=rev&rev=552617
Log:
Fix for AXIS2-1437 - wsdl2java -d jaxbri generated code does not compile

Added:
    webservices/axis2/trunk/java/modules/jaxbri/test-resources/wsdl/Test01.wsdl
Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
    webservices/axis2/trunk/java/modules/jaxbri/pom.xml
    webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=552617&r1=552616&r2=552617
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Mon Jul  2 15:44:43 2007
@@ -464,25 +464,56 @@
                 <!-- todo need to change this to cater for unwrapped messages (multiple parts) -->
                 <xsl:choose>
                     <xsl:when test="$style='document' or $style='rpc'">
-                           java.lang.Object object = fromOM(
-                                        _returnEnv.getBody().getFirstElement() ,
-                                        <xsl:value-of select="$outputtype"/>.class,
-                                         getEnvelopeNamespaces(_returnEnv));
-                           _messageContext.getTransportOut().getSender().cleanup(_messageContext);
-                          <xsl:choose>
-                              <xsl:when test="$outputparamcount=1">
-                                   return get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of
-                                      select="$outputparampartname"/>((<xsl:value-of select="$outputtype"/>)object);
-                              </xsl:when>
-                              <!-- this covers both back compatibility and normal unwrapping -->
-                              <xsl:when test="(string-length(normalize-space($outputcomplextype)) > 0)">
-                                   return get<xsl:value-of select="$outputopname"/>((<xsl:value-of select="$outputtype"/>)object);
-                              </xsl:when>
-                              <xsl:otherwise>
-                                   return (<xsl:value-of select="$outputtype"/>)object;
-                              </xsl:otherwise>
-                          </xsl:choose>
-
+                        <xsl:choose>
+                            <xsl:when test="$outputtype='byte'">
+                                return toByte(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='char'">
+                                return toChar(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='double'">
+                                return toDouble(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='float'">
+                                return toFloat(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='int'">
+                                return toInt(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='long'">
+                                return toLong(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:when test="$outputtype='short'">
+                                return toShort(_returnEnv.getBody().getFirstElement(),
+                                                                 getEnvelopeNamespaces(_returnEnv));
+                            </xsl:when>
+                            <xsl:otherwise>
+                                java.lang.Object object = fromOM(
+                                             _returnEnv.getBody().getFirstElement() ,
+                                             <xsl:value-of select="$outputtype"/>.class,
+                                              getEnvelopeNamespaces(_returnEnv));
+                                _messageContext.getTransportOut().getSender().cleanup(_messageContext);
+                               <xsl:choose>
+                                   <xsl:when test="$outputparamcount=1">
+                                        return get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of
+                                           select="$outputparampartname"/>((<xsl:value-of select="$outputtype"/>)object);
+                                   </xsl:when>
+                                   <!-- this covers both back compatibility and normal unwrapping -->
+                                   <xsl:when test="(string-length(normalize-space($outputcomplextype)) > 0)">
+                                        return get<xsl:value-of select="$outputopname"/>((<xsl:value-of select="$outputtype"/>)object);
+                                   </xsl:when>
+                                   <xsl:otherwise>
+                                        return (<xsl:value-of select="$outputtype"/>)object;
+                                   </xsl:otherwise>
+                               </xsl:choose>
+                            </xsl:otherwise>
+                        </xsl:choose>
                     </xsl:when>
                     <xsl:otherwise>
                          //Unknown style detected !! No code is generated
@@ -702,21 +733,53 @@
                             public void onMessage(org.apache.axis2.context.MessageContext resultContext) {
                             try {
                                 org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope();
-                                java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(),
-                                                                 <xsl:value-of select="$outputtype"/>.class,
-                                                                 getEnvelopeNamespaces(resultEnv));
-                                callback.receiveResult<xsl:value-of select="@name"/>(<xsl:choose>
-                                <xsl:when test="$outputtype=''">);</xsl:when>
-                                <xsl:when test="$outputparamcount=1">
-                                    get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of
-                                      select="$outputparampartname"/>((<xsl:value-of select="$outputtype"/>)object));
-                                </xsl:when>
-                                <xsl:when test="string-length(normalize-space($outputcomplextype)) > 0">
-                                    (<xsl:value-of select="$outputcomplextype"/>)object);
-                                </xsl:when>
-                                <xsl:otherwise>
-                                (<xsl:value-of select="$outputtype"/>)object);
-                                </xsl:otherwise>
+                                <xsl:choose>
+                                    <xsl:when test="$outputtype='byte'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toByte(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='char'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toChar(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='double'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toDouble(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='float'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toFloat(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='int'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toInt(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='long'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toLong(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:when test="$outputtype='short'">
+                                        callback.receiveResult<xsl:value-of select="@name"/>(toShort(resultEnv.getBody().getFirstElement(),
+                                                                         getEnvelopeNamespaces(resultEnv)));
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        java.lang.Object object = fromOM(resultEnv.getBody().getFirstElement(),
+                                                                         <xsl:value-of select="$outputtype"/>.class,
+                                                                         getEnvelopeNamespaces(resultEnv));
+                                        callback.receiveResult<xsl:value-of select="@name"/>(<xsl:choose>
+                                        <xsl:when test="$outputtype=''">);</xsl:when>
+                                        <xsl:when test="$outputparamcount=1">
+                                            get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of
+                                              select="$outputparampartname"/>((<xsl:value-of select="$outputtype"/>)object));
+                                        </xsl:when>
+                                        <xsl:when test="string-length(normalize-space($outputcomplextype)) > 0">
+                                            (<xsl:value-of select="$outputcomplextype"/>)object);
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                        (<xsl:value-of select="$outputtype"/>)object);
+                                        </xsl:otherwise>
+                                        </xsl:choose>
+                                    </xsl:otherwise>
                             </xsl:choose>
                             } catch (org.apache.axis2.AxisFault e) {
                                 callback.receiveError<xsl:value-of select="@name"/>(e);

Modified: webservices/axis2/trunk/java/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/pom.xml?view=diff&rev=552617&r1=552616&r2=552617
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/pom.xml Mon Jul  2 15:44:43 2007
@@ -116,13 +116,23 @@
                                 <mkdir dir="${schema.generated.src.dir}"/>
                                 <mkdir dir="${schema.generated.classes.dir}"/>
                                 <!-- Run JAXB schema compiler with designated schemas -->
-                                <echo>Generating JAX-B classes from XSDs</echo>
-                                <echo>Generating java from soap 11</echo>
+                                <echo>Generating JAX-B classes for DocLitBareService test</echo>
                                 <java classname="com.sun.tools.xjc.Driver" fork="true">
                                     <classpath refid="maven.runtime.classpath"/>
                                     <classpath location="${compiled.classes.dir}"/>
                                     <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/DocLitBareService.wsdl"/>
                                 </java>
+                                <echo>Generating Service Client for Test01 test</echo>
+								<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+									<classpath refid="maven.runtime.classpath"/>
+									<classpath location="${compiled.classes.dir}"/>
+									<arg line="-d jaxbri -o target/wsdl/Test01 -u -uri ${wsdl.source.dir}/Test01.wsdl"/>
+								</java>
+								<javac fork="true" destdir="${schema.generated.src.dir}" debug="on">
+									<classpath refid="maven.runtime.classpath"/>
+									<classpath location="${compiled.classes.dir}"/>
+									<src path="target/wsdl/Test01"/>
+								</javac>
                             </tasks>
                         </configuration>
                         <goals>

Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl?view=diff&rev=552617&r1=552616&r2=552617
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/template/JaxbRIDatabindingTemplate.xsl Mon Jul  2 15:44:43 2007
@@ -35,7 +35,7 @@
 
         <xsl:for-each select="param[not(@type = preceding-sibling::param/@type)]">
             <xsl:if test="@type!=''">
-                private static final javax.xml.bind.JAXBContext <xsl:value-of select="translate(@type,'.','_')"/>;
+                private static final javax.xml.bind.JAXBContext _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
             </xsl:if>
         </xsl:for-each>
 
@@ -54,7 +54,7 @@
                         Runtime.getRuntime().exit(-1);
                     }
                     finally {
-                        <xsl:value-of select="translate(@type,'.','_')"/> = jc;
+                        _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/> = jc;
                         classContextMap.put(<xsl:value-of select="@type"/>.class, jc);
                     }
                 </xsl:if>
@@ -67,7 +67,7 @@
                 private org.apache.axiom.om.OMElement toOM(<xsl:value-of select="@type"/> param, boolean optimizeContent)
                 throws org.apache.axis2.AxisFault {
                     try {
-                        javax.xml.bind.JAXBContext context = <xsl:value-of select="translate(@type,'.','_')"/>;
+                        javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
                         javax.xml.bind.Marshaller marshaller = context.createMarshaller();
                         marshaller.setProperty(javax.xml.bind.Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
 
@@ -89,12 +89,118 @@
                 private org.apache.axiom.soap.SOAPEnvelope toEnvelope(org.apache.axiom.soap.SOAPFactory factory, <xsl:value-of select="@type"/> param, boolean optimizeContent)
                 throws org.apache.axis2.AxisFault {
                     org.apache.axiom.soap.SOAPEnvelope envelope = factory.getDefaultEnvelope();
-                    if (param != null){
-                        envelope.getBody().addChild(toOM(param, optimizeContent));
-                    }
+                    envelope.getBody().addChild(toOM(param, optimizeContent));
                     return envelope;
                 }
 
+                <xsl:variable name="propertyType" select="@type"/>
+                <xsl:choose>
+                    <xsl:when test="$propertyType='byte'">
+                        private byte toByte (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Byte ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), byte.class).getValue();
+                                return ret.byteValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='char'">
+                        private char toChar (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Character ret = (java.lang.Character)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), char.class).getValue();
+                                return ret.charValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='double'">
+                        private double toDouble (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Double ret = (java.lang.Double)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), double.class).getValue();
+                                return ret.doubleValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='float'">
+                        private float toFloat (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Float ret = (java.lang.Float)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), float.class).getValue();
+                                return ret.floatValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='int'">
+                        private int toInt (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Integer ret = (java.lang.Integer)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), int.class).getValue();
+                                return ret.intValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='long'">
+                        private long toLong (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Long ret = (java.lang.Long)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), long.class).getValue();
+                                return ret.longValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                    <xsl:when test="$propertyType='short'">
+                        private short toShort (
+                            org.apache.axiom.om.OMElement param,
+                            java.util.Map extraNamespaces) throws org.apache.axis2.AxisFault{
+                            try {
+                                javax.xml.bind.JAXBContext context = _<xsl:value-of select="translate(@type,'.&gt;&lt;','___')"/>;
+                                javax.xml.bind.Unmarshaller unmarshaller = context.createUnmarshaller();
+
+                                java.lang.Short ret = (java.lang.Short)unmarshaller.unmarshal(param.getXMLStreamReaderWithoutCaching(), short.class).getValue();
+                                return ret.shortValue();
+                            } catch (javax.xml.bind.JAXBException bex){
+                                throw org.apache.axis2.AxisFault.makeFault(bex);
+                            }
+                        }
+                    </xsl:when>
+                </xsl:choose>
             </xsl:if>
         </xsl:for-each>
 

Added: webservices/axis2/trunk/java/modules/jaxbri/test-resources/wsdl/Test01.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/test-resources/wsdl/Test01.wsdl?view=auto&rev=552617
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/test-resources/wsdl/Test01.wsdl (added)
+++ webservices/axis2/trunk/java/modules/jaxbri/test-resources/wsdl/Test01.wsdl Mon Jul  2 15:44:43 2007
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://wsns.foo.com/axis2/test01" xmlns:typ="http://xmlns.foo.com/axis2/test01" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://www.foo.com/wsdl.xsd" targetNamespace="http://wsns.foo.com/axis2/test01" name="Test01">
+    <types>
+        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xmlns.foo.com/axis2/test01" elementFormDefault="qualified">
+            <xs:element name="Add">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="Arg1" type="xs:int"/>
+                        <xs:element name="Arg2" type="xs:int"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AddReturn" type="xs:int"/>
+        </xs:schema>
+    </types>
+    <message name="Add">
+        <part name="params" element="typ:Add"/>
+    </message>
+    <message name="AddResponse">
+        <part name="result" element="typ:AddReturn"/>
+    </message>
+    <portType name="Test01PortType">
+        <operation name="Add">
+            <input name="Add" message="tns:Add"/>
+            <output name="AddResponse" message="tns:AddResponse"/>
+        </operation>
+    </portType>
+    <binding name="Test01PortBinding" type="tns:Test01PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="Add">
+            <soap:operation soapAction="Add" style="document"/>
+            <input>
+                <soap:body use="literal" namespace="http://wsns.foo.com/axis2/test01"/>
+            </input>
+            <output>
+                <soap:body use="literal" namespace="http://wsns.foo.com/axis2/test01"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="Test01">
+        <port name="Axis2SampleDocLitPort" binding="tns:Test01PortBinding">
+            <soap:address location="http://requiem.foo.com:8080/axis2/services/Test01"/>
+        </port>
+    </service>
+</definitions>



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