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 di...@apache.org on 2006/11/10 16:40:02 UTC

svn commit: r473371 - in /webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java: MessageReceiverTemplate.xsl SkeletonTemplate.xsl

Author: dims
Date: Fri Nov 10 07:40:01 2006
New Revision: 473371

URL: http://svn.apache.org/viewvc?view=rev&rev=473371
Log:
get xslt to work even in JDK1.4 w/o xalan (best bet is to make sure xalan is in classpath when running codegen)

Modified:
    webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
    webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl

Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?view=diff&rev=473371&r1=473370&r2=473371
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Fri Nov 10 07:40:01 2006
@@ -68,10 +68,10 @@
                     <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable>
                     <xsl:variable name="style"><xsl:value-of select="@style"/></xsl:variable>
 
-                    <xsl:variable name="returntype"><xsl:value-of select="output/param/@type"/></xsl:variable>
-                    <xsl:variable name="returnvariable"><xsl:value-of select="output/param/@name"/></xsl:variable>
+                    <xsl:variable name="returntype" select="output/param/@type"/>
+                    <xsl:variable name="returnvariable" select="output/param/@name"/>
 
-                    <xsl:if test="$returntype!=''">
+                    <xsl:if test="string-length(normalize-space($returntype)) &gt; 0">
                         <xsl:value-of select="$returntype"/>
                         <xsl:text> </xsl:text>
                         <xsl:value-of select="$returnvariable"/> = null;
@@ -103,7 +103,7 @@
                                                         <!--= get<xsl:value-of select="@partname"/>(wrappedParam);-->
                                             <!--</xsl:for-each>-->
 
-                                            <xsl:if test="$returntype!=''"><xsl:value-of select="$returnvariable"/> =</xsl:if>
+                                            <xsl:if test="string-length(normalize-space($returntype)) &gt; 0"><xsl:value-of select="$returnvariable"/> =</xsl:if>
                                        skel.<xsl:value-of select="@name"/>(
                                             <xsl:for-each select="input/param[@location='body' and @type!='']/param">
                                                 <xsl:if test="position() &gt; 1">,</xsl:if>
@@ -114,19 +114,19 @@
 
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <xsl:if test="$returntype!=''"><xsl:value-of select="$returnvariable"/> =</xsl:if>
+                                            <xsl:if test="string-length(normalize-space($returntype)) &gt; 0"><xsl:value-of select="$returnvariable"/> =</xsl:if>
                                              skel.<xsl:value-of select="@name"/>(wrappedParam) ;
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:when>
                                 <xsl:otherwise>
-                                     <xsl:if test="$returntype!=''"><xsl:value-of select="$returnvariable"/> =</xsl:if>
+                                     <xsl:if test="string-length(normalize-space($returntype)) &gt; 0"><xsl:value-of select="$returnvariable"/> =</xsl:if>
                                      skel.<xsl:value-of select="@name"/>();
                                 </xsl:otherwise>
                             </xsl:choose>
 
                             <xsl:choose>
-                                <xsl:when test="$returntype!=''">
+                                <xsl:when test="string-length(normalize-space($returntype)) &gt; 0">
                                     envelope = toEnvelope(getSOAPFactory(msgContext), <xsl:value-of select="$returnvariable"/>, false);
                                 </xsl:when>
                                 <xsl:otherwise>

Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?view=diff&rev=473371&r1=473370&r2=473371
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Fri Nov 10 07:40:01 2006
@@ -15,7 +15,7 @@
         <xsl:if test="@skeletonInterfaceName"> implements <xsl:value-of select="@skeletonInterfaceName"/></xsl:if>{
      <xsl:for-each select="method">
          <xsl:variable name="count"><xsl:value-of select="count(output/param)"/></xsl:variable>
-         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"/></xsl:variable>
+         <xsl:variable name="outputtype" select="output/param/@type"/>
          <!-- regardless of the sync or async status, the generated method signature would be just a usual
                java method -->
         /**
@@ -53,7 +53,7 @@
                <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@name"/>
            </xsl:for-each>{
                 //Todo fill this with the necessary business logic
-                <xsl:if test="$outputtype!=''">throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#<xsl:value-of select="@name"/>");</xsl:if>
+                <xsl:if test="string-length(normalize-space($outputtype)) &gt; 0">throw new  java.lang.UnsupportedOperationException("Please implement " + this.getClass().getName() + "#<xsl:value-of select="@name"/>");</xsl:if>
         }
      </xsl:for-each>
     }



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