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 2006/10/05 21:10:19 UTC
svn commit: r453319 - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java:
InterfaceImplementationTemplate.xsl SkeletonInterfaceTemplate.xsl
SkeletonTemplate.xsl
Author: dims
Date: Thu Oct 5 12:10:18 2006
New Revision: 453319
URL: http://svn.apache.org/viewvc?view=rev&rev=453319
Log:
cleanup commented unused code
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.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=453319&r1=453318&r2=453319
==============================================================================
--- 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 Thu Oct 5 12:10:18 2006
@@ -716,39 +716,6 @@
}
return false;
}
-
-
- <!-- write the classes for the exceptions if there are any present
- <xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
-
- private <xsl:value-of select="@type"/> faultMessage;
-
- public <xsl:value-of select="@shortName"/>() {
- super("<xsl:value-of select="@shortName"/>");
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s) {
- super(s);
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s, java.lang.Throwable ex) {
- super(s, ex);
- }
-
- public void setFaultMessage(<xsl:value-of select="@type"/> msg){
- faultMessage = msg;
- }
-
- public <xsl:value-of select="@type"/> getFaultMessage(){
- return faultMessage;
- }
-
-
-
- }
- </xsl:for-each>
- -->
//<xsl:apply-templates><xsl:with-param name="context">interface-implementation</xsl:with-param></xsl:apply-templates>
}
</xsl:template>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl?view=diff&rev=453319&r1=453318&r2=453319
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl Thu Oct 5 12:10:18 2006
@@ -1,85 +1,54 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="text"/>
- <xsl:template match="/interface">
- /**
- * <xsl:value-of select="@name"/>.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
- package <xsl:value-of select="@package"/>;
- /**
- * <xsl:value-of select="@name"/> java skeleton interface for the axisService
- */
- public interface <xsl:value-of select="@name"></xsl:value-of> {
- <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>
- <!-- regardless of the sync or async status, the generated method signature would be just a usual
- java method -->
- /**
- * Auto generated method signature
- */
- public <xsl:if test="$count=0 or $outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- (
- <xsl:variable name="inputcount" select="count(input/param[@location='body' and @type!=''])"/>
- <xsl:choose>
- <xsl:when test="$inputcount=1">
- <!-- Even when the parameters are 1 we have to see whether we have the
- wrapped parameters -->
- <xsl:variable name="inputWrappedCount" select="count(input/param[@location='body' and @type!='']/param)"/>
- <xsl:choose>
- <xsl:when test="$inputWrappedCount > 0">
- <xsl:for-each select="input/param[@location='body' and @type!='']/param">
- <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="input/param[@location='body' and @type!='']/@type"/><xsl:text> </xsl:text><xsl:value-of select="input/param[@location='body' and @type!='']/@name"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise><!-- Just leave it - nothing we can do here --></xsl:otherwise>
- </xsl:choose>
- )
- <!--add the faults-->
- <xsl:for-each select="fault/param[@type!='']">
- <xsl:if test="position()=1">throws </xsl:if>
- <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@name"/>
- </xsl:for-each>;
- </xsl:for-each>
-
-
- <!-- write the classes for the exceptions if there are any present
- <xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
-
- private <xsl:value-of select="@type"/> faultMessage;
-
- public <xsl:value-of select="@shortName"/>() {
- super("<xsl:value-of select="@shortName"/>");
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s) {
- super(s);
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s, java.lang.Throwable ex) {
- super(s, ex);
- }
-
- public void setFaultMessage(<xsl:value-of select="@type"/> msg){
- faultMessage = msg;
- }
-
- public <xsl:value-of select="@type"/> getFaultMessage(){
- return faultMessage;
- }
-
-
- }
- </xsl:for-each>
- -->
- }
- </xsl:template>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text"/>
+ <xsl:template match="/interface">
+ /**
+ * <xsl:value-of select="@name"/>.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: #axisVersion# #today#
+ */
+ package <xsl:value-of select="@package"/>;
+ /**
+ * <xsl:value-of select="@name"/> java skeleton interface for the axisService
+ */
+ public interface <xsl:value-of select="@name"></xsl:value-of> {
+ <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>
+ <!-- regardless of the sync or async status, the generated method signature would be just a usual
+ java method -->
+ /**
+ * Auto generated method signature
+ */
+ public <xsl:if test="$count=0 or $outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>
+ (
+ <xsl:variable name="inputcount" select="count(input/param[@location='body' and @type!=''])"/>
+ <xsl:choose>
+ <xsl:when test="$inputcount=1">
+ <!-- Even when the parameters are 1 we have to see whether we have the
+ wrapped parameters -->
+ <xsl:variable name="inputWrappedCount" select="count(input/param[@location='body' and @type!='']/param)"/>
+ <xsl:choose>
+ <xsl:when test="$inputWrappedCount > 0">
+ <xsl:for-each select="input/param[@location='body' and @type!='']/param">
+ <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="input/param[@location='body' and @type!='']/@type"/><xsl:text> </xsl:text><xsl:value-of select="input/param[@location='body' and @type!='']/@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise><!-- Just leave it - nothing we can do here --></xsl:otherwise>
+ </xsl:choose>
+ )
+ <!--add the faults-->
+ <xsl:for-each select="fault/param[@type!='']">
+ <xsl:if test="position()=1">throws </xsl:if>
+ <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@name"/>
+ </xsl:for-each>;
+ </xsl:for-each>
+
+ }
+ </xsl:template>
</xsl:stylesheet>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?view=diff&rev=453319&r1=453318&r2=453319
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Thu Oct 5 12:10:18 2006
@@ -1,98 +1,61 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="text"/>
- <xsl:template match="/interface">
- /**
- * <xsl:value-of select="@name"/>.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
- package <xsl:value-of select="@package"/>;
- /**
- * <xsl:value-of select="@name"/> java skeleton for the axisService
- */
- public class <xsl:value-of select="@name"></xsl:value-of>
- <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>
- <!-- regardless of the sync or async status, the generated method signature would be just a usual
- java method -->
- /**
- * Auto generated method signature
- <!-- select only the body parameters -->
- <xsl:for-each select="input/param[@location='body']">
- <xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>
- </xsl:text></xsl:if></xsl:for-each>
- */
- public <xsl:if test="$count=0 or $outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- (
- <xsl:variable name="inputcount" select="count(input/param[@location='body' and @type!=''])"/>
- <xsl:choose>
- <xsl:when test="$inputcount=1">
- <!-- Even when the parameters are 1 we have to see whether we have the
- wrapped parameters -->
- <xsl:variable name="inputWrappedCount" select="count(input/param[@location='body' and @type!='']/param)"/>
- <xsl:choose>
- <xsl:when test="$inputWrappedCount > 0">
- <xsl:for-each select="input/param[@location='body' and @type!='']/param">
- <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="input/param[@location='body' and @type!='']/@type"/><xsl:text> </xsl:text><xsl:value-of select="input/param[@location='body' and @type!='']/@name"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise><!-- Just leave it - nothing we can do here --></xsl:otherwise>
- </xsl:choose>
- )
- <!--add the faults-->
- <xsl:for-each select="fault/param[@type!='']">
- <xsl:if test="position()=1">throws </xsl:if>
- <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:for-each>
-
- <!-- we write the faults here only if it is not the interface mode-->
- <xsl:if test="not(@skeletonInterfaceName)">
- <!-- write the classes for the exceptions if there are any present
-
- <xsl:for-each select="fault-list/fault">
- public static class <xsl:value-of select="@shortName"/> extends java.lang.Exception{
-
- private <xsl:value-of select="@type"/> faultMessage;
-
- public <xsl:value-of select="@shortName"/>() {
- super("<xsl:value-of select="@shortName"/>");
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s, <xsl:value-of select="@type"/> msg) {
- super(s);
- faultMessage = msg;
- }
-
- public <xsl:value-of select="@shortName"/>(java.lang.String s, <xsl:value-of select="@type"/> msg, java.lang.Throwable ex) {
- super(s, ex);
- faultMessage = msg;
- }
-
- public void setFaultMessage(<xsl:value-of select="@type"/> msg){
- faultMessage = msg;
- }
-
- public <xsl:value-of select="@type"/> getFaultMessage(){
- return faultMessage;
- }
-
-
- }
- </xsl:for-each>
- -->
- </xsl:if>
- }
- </xsl:template>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text"/>
+ <xsl:template match="/interface">
+ /**
+ * <xsl:value-of select="@name"/>.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis2 version: #axisVersion# #today#
+ */
+ package <xsl:value-of select="@package"/>;
+ /**
+ * <xsl:value-of select="@name"/> java skeleton for the axisService
+ */
+ public class <xsl:value-of select="@name"></xsl:value-of>
+ <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>
+ <!-- regardless of the sync or async status, the generated method signature would be just a usual
+ java method -->
+ /**
+ * Auto generated method signature
+ <!-- select only the body parameters -->
+ <xsl:for-each select="input/param[@location='body']">
+ <xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>
+ </xsl:text></xsl:if></xsl:for-each>
+ */
+ public <xsl:if test="$count=0 or $outputtype=''">void</xsl:if><xsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>
+ (
+ <xsl:variable name="inputcount" select="count(input/param[@location='body' and @type!=''])"/>
+ <xsl:choose>
+ <xsl:when test="$inputcount=1">
+ <!-- Even when the parameters are 1 we have to see whether we have the
+ wrapped parameters -->
+ <xsl:variable name="inputWrappedCount" select="count(input/param[@location='body' and @type!='']/param)"/>
+ <xsl:choose>
+ <xsl:when test="$inputWrappedCount > 0">
+ <xsl:for-each select="input/param[@location='body' and @type!='']/param">
+ <xsl:if test="position()>1">,</xsl:if><xsl:value-of select="@type"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="input/param[@location='body' and @type!='']/@type"/><xsl:text> </xsl:text><xsl:value-of select="input/param[@location='body' and @type!='']/@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise><!-- Just leave it - nothing we can do here --></xsl:otherwise>
+ </xsl:choose>
+ )
+ <!--add the faults-->
+ <xsl:for-each select="fault/param[@type!='']">
+ <xsl:if test="position()=1">throws </xsl:if>
+ <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:for-each>
+ }
+ </xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org