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 aj...@apache.org on 2005/08/27 07:26:16 UTC
svn commit: r240394 - in /webservices/axis/trunk/java/modules/wsdl:
src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
test-resources/ping-unbound.wsdl
test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java
Author: ajith
Date: Fri Aug 26 22:25:48 2005
New Revision: 240394
URL: http://svn.apache.org/viewcvs?rev=240394&view=rev
Log:
Slightly modifed the MessageReceiver template to improve the generated code
Added a new test to check the code generation for WSDL's without bindings
Added:
webservices/axis/trunk/java/modules/wsdl/test-resources/ping-unbound.wsdl
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=240394&r1=240393&r2=240394&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Fri Aug 26 22:25:48 2005
@@ -1,12 +1,8 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text"/>
<xsl:template match="/interface">
- <xsl:variable name="skeletonname">
- <xsl:value-of select="@skeletonname"/>
- </xsl:variable>
- <xsl:variable name="dbsupportpackage">
- <xsl:value-of select="@dbsupportpackage"/>
- </xsl:variable>
+ <xsl:variable name="skeletonname"><xsl:value-of select="@skeletonname"/></xsl:variable>
+ <xsl:variable name="dbsupportpackage"><xsl:value-of select="@dbsupportpackage"/></xsl:variable>
package <xsl:value-of select="@package"/>;
@@ -47,7 +43,7 @@
<xsl:variable name="style"><xsl:value-of select="@style"/></xsl:variable>
- if(methodName.equals("<xsl:value-of select="@name"/>")){
+ if("<xsl:value-of select="@name"/>".equals(methodName)){
<xsl:if test="$returntype!=''">
@@ -106,7 +102,7 @@
<xsl:when test="$style='doc'">
//doc style
<xsl:if test="$returntype!=''">
- <xsl:value-of select="$returnvariable"/> =</xsl:if> skel.<xsl:value-of select="@name"/>(<xsl:if test="input/param/@type!=''">(<xsl:value-of select="input/param/@type"/>)<xsl:value-of select="$dbsupportpackage"/>.<xsl:value-of select="$dbsupportname"/>.fromOM((org.apache.axis2.om.OMElement)msgContext.getEnvelope().getBody().getFirstChild().detach(), <xsl:value-of select="input/param/@type"/>.class)</xsl:if>);
+ <xsl:value-of select="$returnvariable"/> =</xsl:if> skel.<xsl:value-of select="@name"/>(<xsl:if test="input/param/@type!=''">(<xsl:value-of select="input/param/@type"/>)<xsl:value-of select="$dbsupportpackage"/>.<xsl:value-of select="$dbsupportname"/>.fromOM((org.apache.axis2.om.OMElement)msgContext.getEnvelope().getBody().getFirstElement().detach(), <xsl:value-of select="input/param/@type"/>.class)</xsl:if>);
//Create a default envelop
envelope = getSOAPFactory().getDefaultEnvelope();
Added: webservices/axis/trunk/java/modules/wsdl/test-resources/ping-unbound.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test-resources/ping-unbound.wsdl?rev=240394&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test-resources/ping-unbound.wsdl (added)
+++ webservices/axis/trunk/java/modules/wsdl/test-resources/ping-unbound.wsdl Fri Aug 26 22:25:48 2005
@@ -0,0 +1,52 @@
+<definitions xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://xmlsoap.org/Ping"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ targetNamespace="http://xmlsoap.org/Ping"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping">
+ <s:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+ <s:element name="Ping" nillable="true" type="tns:ping"/>
+ <s:complexType name="ping">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="ticket" type="tns:ticketType"/>
+ <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="ticketType">
+ <s:simpleContent>
+ <s:extension base="s:string">
+ <s:attribute ref="s1:Id"/>
+ </s:extension>
+ </s:simpleContent>
+ </s:complexType>
+ <s:element name="PingResponse" nillable="true" type="tns:pingResponse"/>
+ <s:complexType name="pingResponse">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ </s:schema>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+ <s:attribute name="Id" type="s:string"/>
+ </s:schema>
+ </types>
+ <message name="PingRequest">
+ <part name="ping" element="tns:Ping"/>
+ </message>
+ <message name="PingResponse">
+ <part name="pingResponse" element="tns:PingResponse"/>
+ </message>
+ <portType name="PingPort">
+ <operation name="Ping">
+ <input message="tns:PingRequest"/>
+ <output message="tns:PingResponse"/>
+ </operation>
+ </portType>
+ <!-- Bindings are removed -->
+</definitions>
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java?rev=240394&r1=240393&r2=240394&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Fri Aug 26 22:25:48 2005
@@ -136,6 +136,19 @@
}
}
+ /**
+ * Test for the modified ping-unboond wsdl. The binding is removed
+ * statement
+ */
+ public void testCodeGenerationPingUnbound(){
+
+ try {
+ generateAndCompile("ping-unbound.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+FOLDER_COUNT++);
+ } catch (CodeGenerationException e) {
+ fail("Exception while code generation test!"+ e.getMessage());
+ }
+ }
+
/**
*
* @param wsdlName