axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r224703 [1/2] - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis2/clientapi/ wsdl/src/org/apache/axis2/wsdl/codegen/extension/ wsdl/src/org/apache/axis2/wsdl/template/csharp/ wsdl/src/org/apache/axis2/wsdl/template/general/...
Date Mon, 25 Jul 2005 09:03:15 GMT
Author: ajith
Date: Mon Jul 25 02:00:27 2005
New Revision: 224703

URL: http://svn.apache.org/viewcvs?rev=224703&view=rev
Log:
1. revoked the 80 column change in the templates (apologies for all the folks who work on VI or any 80 column editor. The generated code just do not work!)
2. added two new methods to the call class

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/BeanTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/BeanTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Stub.java Mon Jul 25 02:00:27 2005
@@ -48,6 +48,22 @@
     protected ServiceContext _serviceContext;
     protected EndpointReference toEPR;
 
+    protected boolean doRest=false;
+
+    protected String senderTransport = tra;
+    protected String listenerTransport;
+    protected boolean useSeparateListener;
+
+    public void setTransportInfo(String senderTransport,String listenerTransport,boolean useSeparateListener)throws AxisFault{
+        this.senderTransport = senderTransport;
+        this.listenerTransport=listenerTransport;
+        this.useSeparateListener=useSeparateListener;
+    }
+
+    public void setDoREST(boolean doRest) {
+        this.doRest = doRest;
+    }
+
 
     /**
      * If _maintainSession is set to True all the calls will use the same

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java Mon Jul 25 02:00:27 2005
@@ -1,18 +1,18 @@
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2001-2004 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 package org.apache.axis2.wsdl.codegen.extension;
 
@@ -20,6 +20,7 @@
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
 import org.apache.wsdl.WSDLDescription;
 import org.apache.wsdl.WSDLExtensibilityElement;
+import org.apache.wsdl.WSDLTypes;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.Schema;
 import org.w3c.dom.NamedNodeMap;
@@ -37,8 +38,13 @@
     }
 
     public void engage() throws CodeGenerationException {
-        WSDLDescription wom = this.configuration.getWom();
-        Iterator iterator = wom.getTypes().getExtensibilityElements().iterator();
+        //WSDLDescription wom = this.configuration.getWom();
+        WSDLTypes typesList = configuration.getWom().getTypes();
+        if (typesList == null) {
+            //there are no types to be considered
+            return;
+        }
+        Iterator iterator = typesList.getExtensibilityElements().iterator();
         while (iterator.hasNext()) {
             WSDLExtensibilityElement element = (WSDLExtensibilityElement) iterator.next();
             boolean targetnamespaceFound = false;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/BeanTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/BeanTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/BeanTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/BeanTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,8 +1,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/bean">
-    namespace
-        <xsl:value-of select="@package"/>
+    namespace <xsl:value-of select="@package"/>
     {
 
     ///  &lt;summary&gt;
@@ -10,58 +9,37 @@
     ///  This is meant to be used with the IKVM converted Axis libraries
     /// &lt;/summary&gt;
 
-    public class
-        <xsl:value-of select="@name"/> {
+    public class <xsl:value-of select="@name"/> {
 
 
-        <xsl:for-each select="property">
-            <xsl:variable name="propertyType">
-                <xsl:value-of select="@type"/>
-            </xsl:variable>
-            <xsl:variable name="propertyName">
-                <xsl:value-of select="@name"/>
-            </xsl:variable>
+     <xsl:for-each select="property">
+         <xsl:variable name="propertyType"><xsl:value-of select="@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="propertyName"><xsl:value-of select="@name"></xsl:value-of></xsl:variable>
 
         /// &lt;summary&gt;
-        /// field for
-            <xsl:value-of select="$propertyName"/>
+        /// field for <xsl:value-of select="$propertyName"/>
         ///&lt;/summary&gt;
-         private
-            <xsl:value-of select="$propertyType"/> local
-            <xsl:value-of select="$propertyName"/>;
+         private <xsl:value-of select="$propertyType"/> local<xsl:value-of select="$propertyName"/>;
 
         /// &lt;summary&gt;
         /// Auto generated getter method
         ///&lt;/summary&gt;
+        /// <returns><xsl:value-of select="$propertyType"/></returns>
         ///
-            <returns>
-                <xsl:value-of select="$propertyType"/>
-            </returns>
-        ///
-        public
-            <xsl:value-of select="$propertyType"/>
-            <xsl:text> </xsl:text>get
-            <xsl:value-of select="$propertyName"/>(){
-             return local
-            <xsl:value-of select="$propertyName"/>;
+        public  <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text>get<xsl:value-of select="$propertyName"/>(){
+             return local<xsl:value-of select="$propertyName"/>;
         }
 
         /// &lt;summary&gt;
         /// Auto generated setter method
         ///&lt;/summary&gt;
+        ///<param name="param{$propertyName}"> </param>
         ///
-            <param name="param{$propertyName}"> </param>
-        ///
-        public void set
-            <xsl:value-of select="$propertyName"/>(
-            <xsl:value-of select="$propertyType"/> param
-            <xsl:value-of select="$propertyName"/>){
-             this.local
-            <xsl:value-of select="$propertyName"/>=param
-            <xsl:value-of select="$propertyName"/>;
+        public void set<xsl:value-of select="$propertyName"/>(<xsl:value-of select="$propertyType"/> param<xsl:value-of select="$propertyName"/>){
+             this.local<xsl:value-of select="$propertyName"/>=param<xsl:value-of select="$propertyName"/>;
         }
-        </xsl:for-each>
+     </xsl:for-each>
     }
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/CallbackHandlerTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,27 +1,24 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/callback">
-    namespace
-        <xsl:value-of select="@package"/>
+    namespace <xsl:value-of select="@package"/>
     {
     ///&lt;summary&gt;
     /// Auto generated C# Callback class by the Axis code generator
     /// This is meant to be used with the IKVM converted Axis libraries
     /// &lt;/summary&gt;
 
-    public class
-        <xsl:value-of select="@name"/>
+    public class <xsl:value-of select="@name"/>
     {
 
 
-        <xsl:for-each select="method">
+	<xsl:for-each select="method">
 
         /// &lt;summary&gt;
         /// Auto generated Axis2 call back method
         ///&lt;/summary&gt;
         ///
-        public void receiveResult
-            <xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result)
+        public void receiveResult<xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result)
         {
 			//Fill here with the code to handle the response
 			
@@ -31,16 +28,15 @@
          /// Auto generated Axis2 Error handler
          /// &lt;/summary&gt;
          ///
-        public void receiveError
-            <xsl:value-of select="@name"/>(java.lang.Exception e)
+        public void receiveError<xsl:value-of select="@name"/>(java.lang.Exception e)
         {
 			//Fill here with the code to handle the exception
 
         }
-        </xsl:for-each>
+     </xsl:for-each>
 
      
     }
   }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
=================================================================From axis-cvs-return-7790-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org Mon Jul 25 09:03:52 2005
Return-Path: <axis-cvs-return-7790-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 81507 invoked from network); 25 Jul 2005 09:03:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Jul 2005 09:03:43 -0000
Received: (qmail 45020 invoked by uid 500); 25 Jul 2005 09:03:38 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 44746 invoked by uid 500); 25 Jul 2005 09:03:36 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 44728 invoked by uid 99); 25 Jul 2005 09:03:35 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 25 Jul 2005 02:03:21 -0700
Received: (qmail 81215 invoked by uid 65534); 25 Jul 2005 09:03:18 -0000
Message-ID: <20050725090318.81212.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r224703 [2/2] - in /webservices/axis/trunk/java/modules:
 core/src/org/apache/axis2/clientapi/
 wsdl/src/org/apache/axis2/wsdl/codegen/extension/
 wsdl/src/org/apache/axis2/wsdl/template/csharp/
 wsdl/src/org/apache/axis2/wsdl/template/general/...
Date: Mon, 25 Jul 2005 09:03:15 -0000
To: axis-cvs@ws.apache.org
From: ajith@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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=224703&r1=224702&r2=224703&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 Mon Jul 25 02:00:27 2005
@@ -1,23 +1,20 @@
 <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"/>
-    =============
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceImplementationTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,169 +1,106 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-        <xsl:variable name="interfaceName">
-            <xsl:value-of select="@interfaceName"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
-        <xsl:variable name="callbackname">
-            <xsl:value-of select="@callbackname"/>
-        </xsl:variable>
-        <xsl:variable name="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAs    </xsl:variable>
+	<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>
 	
-    package
-        <xsl:value-of select="@package"/>;
+    package <xsl:value-of select="@package"/>;
 
     /**
      *  Auto generated message receiver
      */
 
-    public class
-        <xsl:value-of select="@name"/> extends
-        <xsl:value-of select="@basereceiver"/>{
+    public class <xsl:value-of select="@name"/> extends <xsl:value-of select="@basereceiver"/>{
     
 		public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext)
 		throws org.apache.axis2.engine.AxisFault{
@@ -26,9 +23,8 @@
 
             // get the implementation class for the Web Service
             Object obj = getTheImplementaync"/>
-        </xsl:variable>
-    namespace
-        <xsl:value-of select="$package"/>{
+    <xsl:variable name="interfaceName"><xsl:value-of select="@interfaceName"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
+    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
+    namespace <xsl:value-of select="$package"/>{
 
     /// &lt;summary&gt;
     /// Auto generated C# implementation by the Axis code generator
     /// This is meant to be used with the IKVM converted Axis libraries
     ///&lt;/summary&gt;
 
-    public class
-        <xsl:value-of select="@name"/> :org.apache.axis2.clientapi.Stub,
-        <xsl:value-of select="$interfaceName"/>{
+    public class <xsl:value-of select="@name"/> :org.apache.axis2.clientapi.Stub,<xsl:value-of select="$interfaceName"/>{
 
         private static org.apache.axis2.description.AxisGlobal  _axisGlobal = null;
         private static org.apache.axis2.engine.AxisSystemImpl   _axisSystem = null;
         private static org.apache.axis2.context.SystemContext   _systemContext = null;
         private static org.apache.axis2.description.AxisService   _service = null;
-        private static org.apache.axis2.description.AxisOperation[] _operations = new org.apache.axis2.description.AxisOperation[
-        <xsl:value-of select="count(method)"/>];
+        private static org.apache.axis2.description.AxisOperation[] _operations = new org.apache.axis2.description.AxisOperation[<xsl:value-of select="count(method)"/>];
 
        ///&lt;summary&gt;
        /// static constructor
        ///&lt; /summary &gt;
-       static
-        <xsl:value-of select="@name"/>(){
+       static <xsl:value-of select="@name"/>(){
          _axisGlobal = new org.apache.axis2.description.AxisGlobal();
          _axisSystem = new org.apache.axis2.engine.AxisSystemImpl(_axisGlobal);
 		 _systemContext = new org.apache.axis2.context.SystemContext(_axisSystem);
 		 _service = new org.apache.axis2.description.AxisService();
-         _service.setName(new javax.xml.namespace.QName("
-        <xsl:value-of select="@namespace"/>", "
-        <xsl:value-of select="@servicename"/>"));
+         _service.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of select="@servicename"/>"));
          org.apache.axis2.description.AxisOperation __operation;
 
-        <xsl:for-each select="method">
+      <xsl:for-each select="method">
           __operation = new org.apache.axis2.description.AxisOperation();
-          __operation.setName(new javax.xml.namespace.QName("
-            <xsl:value-of select="@namespace"/>", "
-            <xsl:value-of select="@name"/>"));
+          __operation.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of tionObject(msgContext);
-
-        <xsl:value-of select="$skeletonname"/> skel = (
-        <xsl:value-of select="$skeletonname"/>)obj;
+           
+            <xsl:value-of select="$skeletonname"/> skel = (<xsl:value-of select="$skeletonname"/>)obj;
             //Out Envelop
              org.apache.axis2.soap.SOAPEnvelope envelope = null;
              //Find the operation that has been set by the Dispatch phase.
@@ -39,135 +35,98 @@
             
             String methodName;
             if(op.getName() != null &amp; (methodName = op.getName().getLocalPart()) != null){
-
-        <xsl:for-each select="method">
-
-            <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="namespace">
-                <xsl:value-of select="@namespace"/>
-            </xsl:variable>
-            <xsl:variable name="dbsupportname">
-                <xsl:value-of select="@dbsupportname"/>
-            </xsl:variable>
-
-            <xsl:variable name="name">
-                <xsl:value-of select="@name"/>
-            </xsl:variable>
-            <xsl:variable name="style">
-                <xsl:value-of select="@style"/>
-            </xsl:variable>
+            
+				<xsl:for-each select="method">
+				
+			<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="namespace"><xsl:value-of select="@namespace"/></xsl:variable>
+			<xsl:variable name="dbsupportname"><xsl:value-of select="@dbsupportname"/></xsl:variable>
+			
+			<xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable>
+			<xsl:variable name="style"><xsl:value-of select="@style"/></xsl:variable>
 					
 					
-					if(methodName.equals("
-            <xsl:value-of select="@name"/>")){
-
-
-            <xsl:if test="$returntype!=''">
-                <xsl:value-of select="$returntype"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$returnvariable"/> = null;
-            </xsl:if>
-
-
-            <xsl:choose>
-                <xsl:when test="$style='rpc'">
-					//rpc style
-                    <xsl:variable name="inputparamcount">
-                        <xsl:value-of select="count(input/param)"/>
-                    </xsl:variable>
-                    <xsl:for-each select="input/param">
-                        <xsl:if test="@type!=''">
+					if(methodName.equals("<xsl:value-of select="@name"/>")){
+											
+				
+			<xsl:if test="$returntype!=''">
+				<xsl:value-of select="$returntype"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="$returnvariable"/> = null;
+						</xsl:if>
+						
+						
+			<xsl:choose>			
+				<xsl:when test="$style='rpc'">
+					//rpc style				
+					<xsl:variable name="inputparamcount"><xsl:value-of select="count(input/param)"/></xsl:variable>
+				<xsl:for-each select="input/param">
+					<xsl:if test="@type!=''">
 		
 					org.apache.axis2.om.OMElement firstChild = (org.apache.axis2.om.OMElement)msgContext.getEnvelope().getBody().getFirstChild();
 					if(null == firstChild)
 						throw new org.apache.axis2.engine.AxisFault("Wrapper Element Not Found for the operation of RPC style");
 					java.util.Iterator children = firstChild.getChildren();
-					org.apache.xmlbeans.XmlObject[] params = new org.apache.xmlbeans.XmlObject[
-                            <xsl:value-of select="$inputparamcount"/>];
+					org.apache.xmlbeans.XmlObject[] params = new org.apache.xmlbeans.XmlObject[<xsl:value-of select="$inputparamcount"/>];
 					int count = 0;
-					while(children.hasNext() &amp;&amp; count &lt;
-                            <xsl:value-of select="$inputparamcount"/>){
-						params[count] = oselect="@name"/>"));
           // more things are supposed to come here
-          _operations[
-            <xsl:value-of select="position()-1"/>]=__operation;
-        </xsl:for-each>
+          _operations[<xsl:value-of select="position()-1"/>]=__operation;
+     </xsl:for-each>
        }
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="inputtype"><xsl:value-org.soapinterop.databinding.echoStringDatabindingSupporter.fromOM((org.apache.axis2.om.OMElement)children.next(),
-                            <xsl:value-of select="@type"/>.class);
+					while(children.hasNext() &amp;&amp; count &lt; <xsl:value-of select="$inputparamcount"/>){
+						params[count] = org.soapinterop.databinding.echoStringDatabindingSupporter.fromOM((org.apache.axis2.om.OMElement)children.next(), <xsl:value-of select="@type"/>.class);
 						count++;
 					}
-				if(count!=
-                            <xsl:value-of select="$inputparamcount"/>)
+				if(count!= <xsl:value-of select="$inputparamcount"/>)
 					throw new org.apache.axis2.engine.AxisFault("Parts mismatch in the message");
-
-                        </xsl:if>
-                    </xsl:for-each>
-
-                    <xsl:if test="$returntype!=''">
-                        <xsl:value-of select="$returnvariable"/> =
-                    </xsl:if> skel.
-                    <xsl:value-of select="@name"/>(
-         f select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
 
-            <xsl:if test="$isSync='1'">
+         <xsl:if test="$isSync='1'">
         /// &lt;summary&gt;
         /// Auto generated method signature
         ///&lt;/summary&gt;
+        ///<xsl:if test="$inputtype!=''">&lt;param name="<xsl:value-of select="$inputparam"/>"/&gt;</xsl:if>
         ///
-                <xsl:if test="$inputtype!=''">&lt;param name="
-                    <xsl:value-of select="$inputparam"/>"/&gt;
-                </xsl:if>
-        ///
-        public
-                <xsl:if test="$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:for-each select="input/param">
-                        <xsl:if test="@type!=''">
-										(
-                            <xsl:value-of select="@type"/>)params[
-                            <xsl:value-of select="position()-1"/>]
-                            <xsl:if test="position()!=$inputparamcount">,</xsl:if>
-                        </xsl:if>
-                    </xsl:for-each>);
+						 
+					</xsl:if>
+				</xsl:for-each>
+				
+					<xsl:if test="$returntype!=''">
+						<xsl:value-of select="$returnvariable"/> =</xsl:if> skel.<xsl:value-of select="@name"/>(
+								<xsl:for-each select="input/param">
+									<xsl:if test="@type!=''">
+										(<xsl:value-of select="@type"/>)params[<xsl:value-of select="position()-1"/>]<xsl:if test="position()!=$inputparamcount">,</xsl:if>
+									</xsl:if>
+								</xsl:for-each>);
 							//Create a default envelop
 								envelope = getSOAPFactory().getDefaultEnvelope();
-								org.apache.axis2.om.OMNamespace ns = g"/>(
-                <xsl:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>)
+        public  <xsl:if test="$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:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>)
         {
 
-		    org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_systemContext.getServiceContext("
-                <xsl:value-of select="generate-id()"/>"));<!-- this needs to change -->
+		    org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_systemContext.getServiceContext("<xsl:value-of select="generate-id()"/>"));<!-- this needs to change -->
  		    org.apache.axis2.cetSOAPFactory().createOMNamespace("
-                    <xsl:value-of select="$namespace"/>", "
-                    <xsl:value-of select="$name"/>Responce");
+								org.apache.axis2.om.OMNamespace ns = getSOAPFactory().createOMNamespace("<xsl:value-of select="$namespace"/>", "<xsl:value-of select="$name"/>Responce");
 								org.apache.axis2.om.OMElement responseMethodName = getSOAPFactory().createOMElement(methodName + "Response", ns);
 								//Create a Omelement of the result if a result exist
-                    <xsl:if test="$returntype!=''">
-									responseMethodName.setFirstChild(
-                        <xsl:value-of select="$dbsupportpackage"/>.
-                        <xsl:value-of select="$dbsupportname"/>.toOM(
-                        <xsl:value-of select="$returnvariable"/>));
-                    </xsl:if>
+								<xsl:if test="$returntype!=''">
+									responseMethodName.setFirstChild(<xsl:value-of select="$dbsupportpackage"/>.<xsl:value-of select="$dbsupportname"/>ontext.MessageContext _messageContext = getMessageContext();
-                <xsl:if test="$outputtype=''">
-             _call.invokeBlocking(_operations[
-                    <xsl:value-of select="position()-1"/>], _messageContext);
+             <xsl:if test="$outputtype=''">
+             _call.invokeBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext);
              return null;
-                </xsl:if>
-                <xsl:if test="$outputtype!=''">
-             Object obj = _call.invokeBlocking(_operations[
-                    <xsl:value-of select="position()-1"/>], _messageContext);
-             return (
-                    <xsl:value-of select="$outputtype"/>)obj;
-                </xsl:if>
-                <!-- this needs to be changed -->
-        }
+             </xsl:if>
+             <xsl:if test="$outputtype!=''">
+             Object obj = _call.invokeBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext);
+            .toOM(<xsl:value-of select="$returnvariable"/>));		
+								</xsl:if>
 											
 								envelope.getBody().setFirstChild(responseMethodName);
-                </xsl:when>
-
-
-                <xsl:when test="$style='doc'">
+				</xsl:when>
+							
+							
+							
+							
+							
+				<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)
-        return (<xsl:value-of select="$outputtype"/>)obj;
             </xsl:if>
-            <xsl:if test="$isAsync='1'">
+            <!-- this needs to be changed -->
+        }
+        </xsl:if>
+        <xsl:if test="$isAsync='1'">
         ///&lt;summary&gt;
         ///Auto generated method signature
         ///&lt;/summary&gt;
+        ///<xsl:if test="$inputtype!=''">&lt;param name="<xsl:value-of select="$inputparam"/>"/&gt;</xsl:if>
         ///
-                <xsl:if test="$inputtype!=''">&lt;param name="
-                    <xsl:value-of select="$inputparam"/>"/&gt;
-                </xsl:if>
-        ///
-        public void start
-                <xsl:value-of select="@name"/>(
-                <xsl:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>)
+        public void start<xsl:value-of select="@name"/>(<xsl:if te             </xsl:if>);
+					<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>);
 						
 					//Create a default envelop
 					envelope = getSOAPFactory().getDefaultEnvelope();
 					//Create a Omelement of the result if a result exist
-
-                    <xsl:if test="$returntype!=''">envelope.getBody().setFirstChild(
-                        <xsl:value-of select="$dbsupportpackage"/>.
-                        <xsl:value-of select="$dbsupportname"/>.toOM(
-                        <xsl:value-of select="$returnvariable"/>));
-                    </xsl:if>
-                </xsl:when>
-
-
-        st="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>)
         {
                 // we know its call because we have the mep at the time of the stub generation.
-		        org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_systemContext.getServiceContext("
-                <xsl:value-of select="generate-id()"/>"));<!-- this needs to change -->
+		        org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_systemContext.getServiceContext("<xsl:value-of select="generate-id()"/>"));<!-- this needs to change -->
  		        org.apache.axis2.context.MessageContext _messageContext = getMessageContext();
-		        _call.invokeNonBlocking(_operations[
-                <xsl:value-of select="position()-1"/>], _messageContext, new CallBack
-                <xsl:value-of select="generate-id()"/>());
-                <!-- this needs to be changed -->
+		        _call.invokeNon        <xsl:otherwise>
+					
+					<xsl:if test="$returntype!=''">envelope.getBody().setFirstChild(<xsl:value-of select="$dbsupportpackage"/>.<xsl:value-of select="$dbsupportname"/>.toOM(<xsl:value-of select="$returnvariable"/>));		
+					</xsl:if>											
+				</xsl:when>
+							
+							
+				<xsl:otherwise>
 									//Unknown style!! No code is generated
 								  throw UnsupportedOperationException("Unknown Style");
-                </xsl:otherwise>
-            </xsl:choose>
+							</xsl:otherwise>
+			</xsl:choose>
 						
 						
 						
 					}
-        </xsl:for-each>
+			   </xsl:for-each>
 			   
 			   newMsgContext.setEnvelope(envelope);
             }
@@ -177,7 +136,7 @@
         } catch (Exception e) {
             throw org.apache.axis2.engine.AxisFault.makeFault(e);
         }
-        <xsl:for-each select="method"/>
+     <xsl:for-each select="method"/>
 		 }
 	
     }

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/templaBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext, new CallBack<xsl:value-of select="generate-id()"/>());
+            <!-- this needs to be changed -->
         }
 
         ///&lt;summary&gt;
         ///  C# does not support anoynmous inner classes
         ///&lt;/summary&gt;
-        private class CallBack
-                <xsl:value-of select="generate-id()"/>:org.apache.axis2.clientapi.CallBack
+        private class CallBack<xsl:value-of select="generate-id()"/>:org.apache.axis2.clientapi.CallBack
         {
           public void onComplete(org.apache.axis2.clientapi.AsyncResult result)
            {
-                    new
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$callbackname"/>().receiveResult
-                <xsl:value-of select="@name"/>(result);
+                    new <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/>().receiveResult<xsl:value-of select="@name"/>(result);
   te/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -2,52 +2,30 @@
     <xsl:output method="text"/>
     <xsl:template match="/interface">
 
-    package
-        <xsl:value-of select="@package"/>;
+    package <xsl:value-of select="@package"/>;
 
     /**
      *  Auto generated java skeleton for the service by the Axis code generator
      */
 
-    public class
-        <xsl:value-of select="@name"/> {
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-o         }
            public void reportError(java.lang.Exception e)
            {
-                     new
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$callbackname"/>().receiveError
-                <xsl:value-of select="@name"/>(e);
+                     new <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/>().receiveError<xsl:value-of select="@name"/>(e);
            }
 
 
 
         }
-            </xsl:if>
-        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
     }
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==========================f select="output/param/@type"/>
-            </xsl:variable>
-
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
+    public class <xsl:value-of select="@name"></xsl:value-of> {
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
 
         /**
          * Auto generated method signature
-         *
-            <xsl:if test="$inputtyp====================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/csharp/InterfaceTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,14 +1,9 @@
 <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="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAsync"/>
-        </xsl:variable>
-    namespace
-        <xsl:value-of select="@package"/>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>    
+    namespace <xsl:value-of select="@package"/>
     {
 
     /// &lt;summary&gt;
@e!=''">@param
-                <xsl:value-of select="$inputparam"/>
-            </xsl:if>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public
-            <xsl:if test="$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:if test="$inputtype!=''">
-                <xsl:value-of select="$inputtype"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$inputparam"/>
-            </xsl:if>){
+        public  <xsl:if test="$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:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inpu@ -16,58 +11,31 @@
     /// This is meant to be used with the IKVM converted Axis libraries
     /// &lt;/summary&gt;
 
-    public interface
-        <xsl:value-of select="@name"/>
+    public interface <xsl:value-of select="@name"></xsl:value-of>
     {
 
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:if test="$isSync='1'">
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="inputtype"><xsl:vtparam"></xsl:value-of></xsl:if>){
                 //Todo fill this with the necessary business logic
-            <xsl:if test="$outputtype!=''">return null;</xsl:if>
+                <xsl:if test="$outputtype!=''">return null;</xsl:if>
         }
 
 
-        </xsl:for-each>
+     </xsl:for-each>
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestClassTemplalue-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:if test="$isSync='1'">
         /// &lt;summary&gt;
         ///  Auto generated interface method
         /// &lt;/summary&gt;
-         public
-                <xsl:if test="$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:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>);
-            </xsl:if>
+         public  <xsl:if test="$outputtype=''">void</xsl:if><ate.xsl Mon Jul 25 02:00:27 2005
@@ -1,30 +1,15 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-        <xsl:variable name="interfaceName">
-            <xsl:value-of select="@interfaceName"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
-        <xsl:variable name="callbackname">
-            <xsl:value-of select="@callbackname"/>
-        </xsl:variable>
-        <xsl:variable name="stubname">
-            <xsl:value-of select="@stubname"/>
-        </xsl:variable>
-        <xsl:variable name="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAsync"/>
-        </xsl:variable>
-        <xsl:variable name="dbpackage">
-            <xsl:value-of select="@dbsupportpackage"/>
-        </xsl:vxsl:if test="$outputtype!=''"><xsl:value-of select="$outputtype"/></xsl:if><xsl:text> </xsl:text><xsl:value-of select="@name"/>(<xsl:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>);
+         </xsl:if>
 
-            <xsl:if test="$isAsync='1'">
+         <xsl:if test="$isAsync='1'">
         ///&lt;summary&gt;
         ///Auto generated interface method
         ///&lt;/summary&gt;
+        ///<xsl:if test="$inputtype!=''">&lt;param  name="<xsl:value-of select="$inputparam"/>"/&gt;</xsl:if>
         ///
-                <xsl:if test="$inputtype!=''">&lt;param  name="
-                    <xsl:value-of select="$inputparam"/>"/&gt;
-                </xsl:if>
-        ///
-        public void start
-                <xsl:value-of select="@name"/>(
-                <xsl:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>) ;
-            </xsl:if>
+        public void start<xsl:value-of select="@name"/>(<xsl:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>) ;
+        </xsl:if>
 
-        </xsl:for-each>
+     </xsl:for-each>
     }
    }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,56 +1,30 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
     <xsl:template match="/interface">
-        <xsl:variable name="receiver">
-            <xsl:value-of select="@messagereceiver"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
+    <xsl:variable name="receiver"><xsl:value-of select="@messagereceiver"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
 
-        <xsl:comment>Auto generated Axis Service XML</xsl:comment>
-        <service>
-            <xsl:attribute name="name">
-                <xsl:value-of select="@servicename"/>
-            </xsl:attribute>
-            <parameter name="ServiceClass" locked="xsd:false">
-                <xsl:choose>
-                    <xsl:when test="$package=''">
-                        <xsl:value-of select="@name"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$package"/>.
-                        <xsl:value-of select="@name"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </parameter>
-            <xsl:for-each select="method">
-                <xsl:comment>Mounting the method
-                    <xsl:value-of select="@name"/>
-                </xsl:comment>
-                <operation>
-                    <xsl:attribute name="name">
-                        <xsl:value-of select="@name"/>
-                    </xsl:attribute>
-                    <xsl:if test="$receiver!=''">
-                        <messageReceiver>
-                            <xsl:choose>
-                                <xsl:when test="$package=''">
-                                    <xsl:attribute name="class">
-                                        <xsl:value-of select="$receiver"/>
-                                    </xsl:attribute>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:attribute name="class">
-                                        <xsl:value-of select="$package"/>.
-                                        <xsl:value-of select="$receiver"/>
-                                    </xsl:attribute>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </messageReceiver>
-                    </xsl:if>
-                </operation>
-            </xsl:for-each>
-        </service>
+    <xsl:comment>Auto generated Axis Service XML</xsl:comment>
+    <service><xsl:attribute name="name"><xsl:value-of select="@servicename"/></xsl:attribute>
+    <parameter name="ServiceClass" locked="xsd:faariable>
+    <xsl:variable name="interfaceName"><xsl:value-of select="@interfaceName"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
+    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
+    <xsl:variable name="stubname"><xsl:value-of select="@stubname"/></xsl:variable>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
+    <xsl:variable name="dbpackage"><xsl:value-of select="@dbsupportpackage"/></xsl:variable>
 
-    package
-        <xsl:value-of select="$package"/>;
+    package <xsl:value-of select="$package"/>;
     
 	import java.io.InputStream;
 	import java.net.ServerSocket;
@@ -47,157 +32,107 @@
      *  Auto generated Junit test case by the Axis code generator
     */
 
-    public class
-        <xsl:value-of select="@name"/> extends junit.framework.TestCase{
+    public clalse">
+         <xsl:choose>
+            <xsl:when test="$package=''"><xsl:value-of select="@name"/></xsl:when>
+            <xsl:otherwise> <xsl:value-of select="$package"/>.<xsl:value-of select="@name"/></xsl:otherwise>
+        </xsl:choose>
+       </parameter>
+    <xsl:for-each select="method">
+         <xsl:comment>Mounting the method <xsl:value-of select="@name"/> </xsl:comment>
+         <operation><xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
+             <xsl:if test="$receiver!=''">
+             <messageReceiver>
+              <xsl:choose>
+                    <xsl:when test="$package=''"><xsl:attribute name="class"><xsl:value-of select="$receiver"/></xsl:attribute></xsl:when>
+                    <xsl:otherwise><xsl:attribute name="class"><xsl:value-of select="$package"/>.<xsl:value-of select="$receiver"/></xsl:attribute></xsl:otherwise>
+              </xsl:choose>
+              </messageReceiver>
+            </xsl:if>
+         </operation>
+ss <xsl:value-of select="@name"/> extends junit.framework.TestCase{
 
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="dbsupportclassname">
-                <xsl:value-of select="@dbsupportname"/>
-            </xsl:variable>
-            <xsl:if test="$isSync='1'">
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of><     </xsl:for-each>
+    </service>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/BeanTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/BeanTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/BeanTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/BeanTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,59 +1,39 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/bean">
-    package
-        <xsl:value-of select="@package"/>;
+    package <xsl:value-of select="@pa/xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="dbsupportclassname"><xsl:value-of select="@dbsupportname"></xsl:value-of></xsl:variable>
+         <xsl:if test="$isSync='1'">
 
         /**
          * Auto generated test method
          */
-        public  void test
-                <xsl:value-of select="@name"/>() throws java.lang.Exception{
+        public  void test<xsl:value-of select="@name"/>() throws java.lang.Exception{
 
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$stubname"/> stub =
-                    new
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$stubname"/>();//the default implementation should point to the right endpoint
+        <xsl:value-of select="$package"/>.<xsl:value-of select="$stubname"/> stub =
+                    new <xsl:value-of select="$package"/>.<xsl:value-of select="$stubname"/>();//the default implementation should point to the right endpoint
           //create a new databinder
-                <xsl:variable name="fullsupporterclassname">
-                    <xsl:value-of select="$dbpackage"/>.
-                    <xsl:value-of select="$dbsupportclassname"/>
-                </xsl:variable>
-                <xsl:value-of select="$fullsupporterclassname"/> databindSupporter = new
-                <xsl:value-of select="$fullsupporterclassname"/>();
+        <xsl:variable name="fullsupporterclassname"><xsl:value-of select="$dbpackage"/>.<xsl:value-of select="$dbsupportclassname"/></xsl:variable>
+        <xsl:value-of select="$fullsupporterclassname"/> databindSupporter = new <xsl:value-of select="$fullsupporterclassname"/>();
 
+           <xsl:choose>
+             <xsl:when test="$inputtype!=''">
                 <xsl:choose>
-                    <xsl:when test="$inputtype!=''">
-                        <xsl:choose>
-                            <xsl:when test="$outputtype=''">
+                    <xsl:when test="$outputtype=''">
                     //There is no output to be tested!
-                    stub.
-                                <xsl:value-of select="@name"/>((
-                                <xsl:value-of select="$inputtype"/>)databindSupporter.getTestObject(
-                                <xsl:value-of select="$inputtype"/>.class));
-                            </xsl:when>
-                            <xsl:otherwise>
-                    assertNotNull(stub.
-                                <xsl:value-of select="@name"/>((
-                                <xsl:value-of select="$inputtype"/>)databindSupporter.getTestObject(
-                                <xsl:value-of select="$inputtype"/>.class)));
-                            </xsl:otherwise>
-                        </xsl:choose>
+                    stub.<xsl:value-of select="@name"/>((<xsl:valuckage"/>;
 
     /**
      *  Auto generated bean class by the Axis code generator
      */
 
-    public class
-        <xsl:value-of select="@name"/> {
+    public class <xsl:value-of select="@name"/> {
 
 
-        <xsl:for-each select="property">
-            <xsl:variable name="propertyType">
-                <xsl:value-of select="@type"/>
-            </xsl:variable>
-            <xsl:variable name="propertyName">
-                <xsl:value-of select="@name"/>
-            </xsl:variable>
+     <xsl:for-each select="property">
+         <xsl:variable name="propertyType"><xsl:value-of select="@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="propertyName"><xsl:value-of select="@name"></xsl:value-of></xsl:variable>
         /**
-         * field for
-            <xsl:value-of select="$propertyName"/>
+         * field for <xsl:value-of select="$propertyName"/>
          */
-         private
-            <xsl:value-of select="$propertyType"/> local
-          e-of select="$inputtype"/>)databindSupporter.getTestObject(<xsl:value-of select="$inputtype"/>.class));
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:choose>
-                            <xsl:when test="$outputtype=''">
+                    assertNotNull(stub.<xsl:value-of select="@name"/>((<xsl:value-of select="$inputtype"/>)databindSupporter.getTestObject(<xsl:value-of select="$inputtype"/>.class)));
+                    </xsl:otherwise>
+                </xsl:choose>
+              </xsl:when>
+              <xsl:otherwise>
+                  <xsl:choose>
+                    <xsl:when test="$outputtype=''">
                     //There is no output to be tested!
-                    stub.
-                                <xsl:value-of select="@name"/>();
-                            </xsl:when>
-                            <xsl:otherwise>
-                    assertNotNull(stub.
-                                <xsl:value-of select="@name"/>());
-                            </xsl:otherwise>
-                        </xsl:choose>
+                    stub.<xsl:value-of select="@name"/>();
+                    </xsl:when>
+                    <xsl:otherwise>
+                    assertNotNull(stub.<xsl:value-of select="@name"/>());
                     </xsl:otherwise>
                 </xsl:choose>
+             </xsl:otherwise>
+            </xsl:choose>
 
 
 
         }
-            </xsl:if>
-            <xsl:if test="$isAsync='1'">
-                <xsl:variable name="tempCallbackName">tempCallback
-                    <xsl:value-of select="generate-id()"/>
-                </xsl:variable>
+        </xsl:if>
+        <xsl:if test="$isAsync='1'">
+            <xsl:variable name="tempCallbackName">tempCallback<xsl:value-of select="generate-id()"/></xsl:variable>
          /**
          * Auto generated test method
          */
-        public  void testStart
-                <xsl:value-of select="@name"/>() thr  <xsl:value-of select="$propertyName"/>;
+         private <xsl:value-of select="$propertyType"/> local<xsl:value-of select="$propertyName"/>;
 
         /**
          * Auto generated getter method
-         * @return
-            <xsl:value-of select="$propertyType"/>
+         * @return <xsl:value-of select="$propertyType"/>
          */
-        public
-            <xsl:value-of select="$propertyType"/>
-            <xsl:text> </xsl:text>get
-            <xsl:value-of select="$propertyName"/>(){
-             return local
-            <xsl:value-of select="$propertyName"/>;
+        public  <xsl:value-of select="$propertyType"/><xsl:text> </xsl:text>get<xsl:value-of select="$propertyName"/>(){
+             return local<xsl:value-of select="$propertyName"/>;
         }
 
         /**
          * Auto generated setter method
-         * @param param
-            <xsl:value-of select="$propertyName"/>
+         * @param param<xsl:value-of select="$propertyName"/>
          */
-    ows java.lang.Exception{
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$stubname"/> stub = new
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$stubname"/>();
+        public  void testStart<xsl:value-of select="@name"/>() throws java.lang.Exception{
+            <xsl:value-of select="$package"/>.<xsl:value-of select="$stubname"/> stub = new <xsl:value-of select="$package"/>.<xsl:value-of select="$stubname"/>();
              //create a new databinder
-                <xsl:variable name="fullsupporterclassname">
-                    <xsl:value-of select="$dbpackage"/>.
-                    <xsl:value-of select="$dbsupportclassname"/>
-                </xsl:variable>
-                <xsl:value-of select="$fullsupporterclassname"/> databindSupporter = new
-                <xsl:value-of select="$fullsupporterclassname"/>();
-                <xsl:choose>
-                    <xsl:when test="$inputtype!=''">
-     public void set
-            <xsl:value-of select="$propertyName"/>(
-            <xsl:value-of select="$propertyType"/> param
-            <xsl:value-of select="$propertyName"/>){
-             this.local
-            <xsl:value-of select="$propertyName"/>=param
-            <xsl:value-of select="$propertyName"/>;
+        public void set<xsl:value-of select="$propertyName"/>(<xsl:value-of select="$propertyType"/> param<xsl:value-of select="$propertyName"/>){
+             this.local<xsl:value-of select="$propertyName"/>=param<xsl:value-of select="$propertyName"/>;
         }
-        </xsl:for-each>
+     </xsl:for-each>
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/CallbackHandlerT               stub.start
-                        <xsl:value-of select="@name"/>((
-                        <xsl:value-of select="$inputtype"/>)databindSupporter.getTestObject(
-                        <xsl:value-of select="$inputtype"/>.class),
-                    new
-                        <xsl:value-of select="$tempCallbackName"/>()
+            <xsl:variable name="fullsupporterclassname"><xsl:value-of select="$dbpackage"/>.<xsl:value-of select="$dbsupportclassname"/></xsl:variable>
+            <xsl:value-of select="$fullsupporterclassname"/> databindSupporter = new <xsl:value-of select="$fullsupporterclassname"/>();
+             <xsl:choose>
+             <xsl:when test="$inputtype!=''">
+                stub.start<xsl:value-of select="@name"/>((<xsl:value-of select="$inputtype"/>)databindSupporter.getTestObject(<xsl:value-of select="$inputtype"/>.class),
+                    new <xsl:value-of select="$tempCallbackName"/>()
                 );
-                    </xsl:when>
-        emplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,15 +1,13 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/callback">
-    package
-        <xsl:value-of select="@package"/>;
+    package <xsl:value-of select="@package"/>;
 
     /**
      *  Auto generated Callback class by the Axis code generator
      */
 
-    public class
-        <xsl:value-of select="@name"/>{
+    public class <xsl:value-of select="@name"/>{
     
     
     
@@ -22,20 +20,17 @@
 	* @param clientData Object mechanism by which the user can pass in user data
 	* that will be avilable at the time this callback is called.
 	*/
-	public
-        <xsl:value-of select="@name"/>(Object clientData){
+	public <xsl:value-of select="@name"/>(Object clientData){
 		this.clientData = clientData;
 	}
 
 
-        <xsl:for-each select="method">
+	<xsl:for-each select="method">
          /**
-         * auto generated Axis2 call back method for
-            <xsl:value-of select="@name"/> method
+         * auto generated Axis2 call back method for <xsl:value-of select="@name"/> method
          *
          */
-        public void receiveResult
-            <xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
+        public void receiveResult<xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
 			//Fill here with the code to handle the response
 			
         }
@@ -44,14 +39,13 @@
          * auto generated Axis2 Error handler
          *
          */
-        public void receiveError
-            <xsl:value-of select="@name"/>(java.lang.Exception e) {
+        public void receiveError<xsl:value-of select="@name"/>(java.lang.Exception e) {
 			//Fill here with the code to handle the exception
 
         }
-        </xsl:for-each>
+     </xsl:for-each>
 
      
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,64 +1,42 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-        <xsl:variable name="interfaceName">
-            <xsl:value-of select="@interfaceName"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
-        <xsl:variable name="callbackname">
-            <xsl:value-of select="@callbackname"/>
-        </xsl:variable>
-        <xsl:variable name="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAsync"/>
-        </xsl:variable>
-        <xsl:variable name="dbpackage">
-            <xsl:value-of select="@dbsupportpackage"/>
-        </xsl:variable>
-    package
-        <xsl:value-of select="$package"/>;
+    <xsl:variable name="interfaceName"><xsl:value-of select="@interfaceName"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
+    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
+    <xsl:variable name="dbpackage"><xsl:value-of select="@dbsupportpackage"/></xsl:variable>
+    package <xsl:value-of select="$package"/>;
 
     /*
      *  Auto generated java implementation by the Axis code generator
     */
 
-    public class
-        <xsl:value-of select="@name"/> extends org.apache.axis2.clientapi.Stub implements
-        <xsl:value-of select="$interfaceName"/>{
+    public class <xsl:value-of select="@name"/> extends org.apache.axis2.clientapi.Stub implements <xsl:value-of select="$interfaceName"/>{
         public static final String AXIS2_HOME = ".";
         protected static org.ap            <xsl:otherwise>
-                stub.start
-                        <xsl:value-of select="@name"/>(
-                    new
-                        <xsl:value-of select="$tempCallbackName"/>()
+              </xsl:when>
+              <xsl:otherwise>
+                stub.start<xsl:value-of select="@name"/>(
+                    new <xsl:value-of select="$tempCallbackName"/>()
                 );
-                    </xsl:otherwise>
-                </xsl:choose>
+             </xsl:otherwise>
+            </xsl:choose>
 
 
         }
 
-        private class
-                <xsl:value-of select="$tempCallbackName"/>  extends
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$callbackname"/>{
-            public
-                <xsl:value-of select="$tempCallbackName"/>(){ super(null);}
+        private class <xsl:value-of select="$tempCallbackName"/>  extends <xsl:value-of select="$package"/>.<xsl:value-of select="$callbacknamache.axis2.description.OperationDescription[] _operations;
 
         static{
 
            //creating the Service
-           _service = new org.apache.axis2.description.ServiceDescription(new javax.xml.namespace.QName("
-        <xsl:value-of select="@namespace"/>","
-        <xsl:value-of select="@servicename"/>"));
+           _service = new org.apache.axis2.description.ServiceDescription(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>","<xsl:value-of select="@servicename"/>"));
 
            //creating the operations
            org.apache.axis2.description.OperationDescription __operation;
-           _operations = new org.apache.axis2.description.OperationDescription[
-        <xsl:value-of select="count(method)"/>];
-        <xsl:for-each select="method">
+           _operations = new org.apache.axis2.description.OperationDescription[<xsl:value-of select="count(method)"/>];
+      <xsl:for-each select="method">
           __operation = new org.apache.axis2.descriptie"/>{
+            public <xsl:value-of select="$tempCallbackName"/>(){ super(null);}
 
-            public void receiveResult
-                <xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
+            public void receiveResult<xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
 			    assertNotNull(result.getResponseEnvelope().getBody().getFirstChild());
             }
 
-            public void receiveError
-                <xsl:value-of select="@name"/>(java.lang.Exception e) {
+            public void receiveError<xsl:value-of select="@name"/>(java.lang.Exception e) {
                 fail();
             }
 
         }
-            </xsl:if>
-        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
 
 
      public static Object createTestInput(Class paramClass){
 
       OMFactory factory = OMAbstractFactory.getOMFactory();
-		OMElement element = factory.createOMElement(new QName("http://soapinterop.org/", "
-        <xsl:value-of select="generate-id()"/>"), null);
-		OMElement element1 = factory.createOMElement(new QName("http://soapinterop.org/","
-        <xsl:value-of select="generate-id()"/>"), element);
+		OMElement element = factory.createOMElement(new QName("http://soapinterop.org/", "<xsl:value-of select="generate-id()"/>"), null);
+		OMElement element1 = factory.createOMElement(new QName("http://soapinterop.org/","<xsl:value-of select="generate-id()"/>"), element);
 		element.addChild(element1);
-    	OMTextImpl text = new OMTextImpl("
-        <xsl:value-of select="generate-id()"/>");
+    	OMTextImpl text = new OMTextImpl("<xsl:value-of select="generate-id()"/>");
     	element1.addChild(text);
     	return element;
     }
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/TestSkeletonImplTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,11 +1,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-        <xsl:variable name="namespace">
-            <xsl:value-of select="@namespace"/>
-        </xsl:variable>
-    package
-        <xsl:value-of select="@package"/>;
+	<xsl:variable name="namespace"><xsl:value-of select="@namespace"/></xsl:variable>
+    package <xsl:value-of select="@package"/>;
     
 		import javax.xml.namespace.QNamon.OperationDescription();
-          __operation.setName(new javax.xml.namespace.QName("
-            <xsl:value-of select="@namespace"/>", "
-            <xsl:value-of select="@name"/>"));
-          _operations[
-            <xsl:value-of select="position()-1"/>]=__operation;
+          __operation.setName(new javax.xml.namespace.QName("<xsl:value-of select="@namespace"/>", "<xsl:value-of select="@name"/>"));
+          _operations[<xsl:value-of select="position()-1"/>]=__operation;
           _service.addOperation(__operation);
-        </xsl:for-each>
+     </xsl:for-each>
        }
 
        /**
         * Constructor
         */
-        public
-        <xsl:value-of select="@name"/>(String axis2Home,String targetEndpoint) throws java.lang.Exception {
+        public <xsl:value-of select="@name"/>(String axis2Home,String targetEndpoint) throws java.lang.Exception {
 
 			this.toEPR = new org.apache.axis2.addressing.EndpointReference(org.apache.axis2.addressing.AddressingConstants.WSe;
 		
@@ -19,61 +16,33 @@
      *  Auto generated java skeleton for the service by the Axis code generator
      */
 
-    public class
-        <xsl:value-of select="@name"/> extends
-        <xsl:value-of select="@implpackage"/>.
-        <xsl:value-of select="@servicename"/>{
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
+    public class <xsl:value-of select="@name"></xsl:value-of> extends <xsl:value-of select="@implpackage"/>.<xsl:value-of select="@servicename"></xsl:value-of>{
+     <xsl:for-each select="method">
+         <xsl:A_TO, targetEndpoint);
 		    //creating the configuration
@@ -71,246 +49,175 @@
         /**
         * Default Constructor
         */
-        public
-        <xsl:value-of select="@name"/>() throws java.lang.Exception {
-		    this(AXIS2_HOME,"
-        <xsl:value-of select="endpoint"/>" );
+        public <xsl:value-of select="@name"/>() throws java.lang.Exception {
+		    this(AXIS2_HOME,"<xsl:value-of select="endpoint"/>" );
 	    }
 
 
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-            <xsl:variable name="style">
-                <xsl:value-of select="@style"/>
-            </xsl:variable>
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="dbsupportclassname">
-                <xsl:value-of select="@dbsupportname"/>
-            </xsl:variable>
-            <xsl:variable name="soapAction">
-                <xsl:value-of select="@soapaction"/>
-            </xsl:variable>
-            <xsl:variable name="fullsupporterclassname">
-                <xsl:value-of select="$dbpackage"/>.
-                <xsl:value-of select="$dbsupportclassname"/>
-            </xsl:variable>
 
-            <!-- When genrating code, the MEP should be taken into account    -->
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="style"><xsl:value-of select="@style"></xsl:value-of></xsl:variable>
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="dbsupportclassname"><xsl:value-of select="@dbsupportname"></xsl:value-of></xsl:variable>  
+         <xsl:variable name="soapAction"><xsl:value-of select="@soapaction"></xsl:value-of></xsl:variable>
+         <xsl:variable name="fullsupporterclassname"><xsl:value-of select="$dbpackage"/>.<xsl:value-of select="$dbsupportclassname"/></xsl:variable>
 
-            <xsl:if test="$isSync='1'">
+         <!-- When genrating code, the MEP should be taken into account    -->
+
+         <xsl:if test="$isSync='1'">
         /**
          * Auto generated method signature
-         * @see
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$interfaceName"/>#
-                <xsl:value-of select="@name"/>
-         *
-                <xsl:if test="$inputtype!=''">@param
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>
+         * @see <xsl:value-of select="$package"/>.<xsl:value-of select="$interfaceName"/>#<xsl:value-of select="@name"/>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public
-                <xsl:if test="$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:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>) throws java.rmi.RemoteException{
+        public  <xsl:if test="$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:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>) throws java.rmi.RemoteException{
 
 		    org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_serviceContext);
+            _call.setTransportInfo(this.senderTransport,this.listenerTransport,this.useSeparateListener);
+            _call.setDoREST(this.doRest); 
+
  		    org.apache.axis2.context.MessageContext _messageContext = getMessageContext();
             _call.setTo(this.toEPR);
-            _call.setSoapAction("
-                <xsl:value-of select="$soapAction"/>");
+            _call.setSoapAction("<xsl:value-of select="$soapAction"/>");
             org.apache.axis2.soap.SOAPEnvelope env = null;
             env = createEnvelope();
-                <xsl:choose>
-                    <xsl:when test="$inputtype!=''">
-                        <xsl:choose>
-                            <xsl:when test="$style='rpc'">
+            <xsl:choose>
+              <xsl:when test="$inputtype!=''">
+                  <xsl:choose>
+                      <xsl:when test="$style='rpc'">
                        // Style is RPC
                              setValueRPC(env,
-                            "
-                                <xsl:value-of select="@namespace"/>",
-                            "
-                                <xsl:value-of select="@name"/>",
-                            new String[]{"
-                                <xsl:value-of select="$inputparam"/>"},
-                            new Object[]{
-                                <xsl:value-of select="$inputparam"/>});  //this needs to be fixed
-                            </xsl:when>
+                            "<xsl:value-of select="@namespace"/>",
+                            "<xsl:value-of select="@name"/>",
+                            new String[]{"<xsl:value-of select="$inputparam"/>"},
+                            new Object[]{<xsl:value-of select="$inputparam"/>});  //this needs to be fixed
+                      </xsl:when>
 
-                            <xsl:when test="$style='doc'">
+                      <xsl:when test="$style='doc'">
                        //Style is Doc
-                       setValueDoc(env,
-                                <xsl:value-of select="$fullsupporterclassname"/>.toOM(
-                                <xsl:value-of select="$inputparam"/>));
-                            </xsl:when>
-                            <xsl:otherwise>
+                       setValueDoc(env,<xsl:value-of select="$fullsupporterclassname"/>.toOM(<xsl:value-of select="$inputparam"/>));
+                      </xsl:when>
+                      <xsl:otherwise>
                        //Unknown style!! No code is generated
                        throw java.lang.UnsupportedOperationException("Unknown Style");
-                            </xsl:otvariable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
 
         /**
          * Auto generated method signature
-         *
-            <xsl:if test="$inputtype!=''">@param
-                <xsl:value-of select="$inputparam"/>
-            </xsl:if>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public
-            <xsl:if test="$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:ifherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:choose>
-                            <xsl:when test="$style='rpc'">
+                      </xsl:otherwise>
+                  </xsl:choose>
+              </xsl:when>
+              <xsl:otherwise>
+                   <xsl:choose>
+                   <xsl:when test="$style='rpc'">
                        //Style is RPC. No input parameters
                           setValueRPC(env,
-                            "
-                                <xsl:value-of select="@namespace"/>",
-                            "
-                                <xsl:value-of select="@name"/>",
+                            "<xsl:value-of select="@namespace"/>",
+                            "<xsl:value-of select="@name"/>",
                             null,
                             null);
-                            </xsl:when>
-                            <!-- The follwing code is specific to XML beans-->
-                            <xsl:when test="$style='doc'">
+                      </xsl:when>
+                      <!-- The follwing code is specific to XML beans-->
+                      <xsl:when test="$style='doc'">
                        //Style is Doc. No input parameters
                        setValueDoc(env,null);
-                            </xsl:when>
-                            <xsl:otherwise>
+                      </xsl:when>
+                      <xsl:otherwise>
                          //Unknown style!! No code is generated
                           throw UnsupportedOperationException("Unknown Style");
-                            </xsl:otherwise>
-                        </xsl:choose>
+                      </xsl:otherwise>
+                  </xsl:choose>
 
-                    </xsl:otherwise>
-                </xsl:choose>
+             </xsl:otherwise>
+            </xsl:choose>
              _messageC test="$inputtype!=''">
-                <xsl:value-of select="$inputtype"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$inputparam"/>
-            </xsl:if>){
+        public  <xsl:if test="$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:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>){
                 //Todo fill this with the necessary business logic
-            <xsl:if test="$outputtype!=''">
+                <xsl:if test="$outputtype!=''"> 
                 //Returns an simple om element
         	OMFactory factory = OMAbstractFactory.getOMFactory();
-			OMElement element = factory.createOMElement(new QName("
-                <xsl:value-of select="$namespace"/>", "
-                <xsl:value-of select="generate-id()"/>"), null);
-			OMElement elemontext.setEnvelope(env);
-                <xsl:choose>
-                    <xsl:when test="$outputtype=''">
-               _call.invokeBlocking(_operations[
-                        <xsl:value-of select="position()-1"/>], _messageContext);
+             <xsl:choose>
+                 <xsl:when test="$outputtype=''">
+               _call.invokeBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext);
                return;
-                    </xsl:when>
-                    <xsl:otherwise>
-             org.apache.axis2.context.MessageContext  _returnMessageContext = _call.invokeBlocking(_operations[
-                        <xsl:value-of select="position()-1"/>], _messageContext);
+              </xsl:when>
+              <xsl:otherwise>
+             org.apache.axis2.context.MessageContext  _returnMessageContext = _call.invokeBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext);
              org.apache.axis2.soap.SOAPEnvelope _returnEnv = _ent1 = factory.createOMElement(new QName("
-                <xsl:value-of select="$namespace"/>","
-                <xsl:value-of select="generate-id()"/>"), element);
+			OMElement element = factory.createOMElement(new QName("<xsl:value-of select="$namespace"/>", "<xsl:value-of select="generate-id()"/>"), null);
+			OMElement element1 = factory.createOMElement(new QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="generate-id()"/>"), element);
 			element.addChild(element1);
-        	OMTextImpl text = new OMTextImpl("
-                <xsl:value-of select="generate-id()"/>");
+        	OMTextImpl text = new OMTextImpl("<xsl:value-of select="generate-id()"/>");
         	element1.addChild(text);
         	return element;
-            </xsl:if>
+        	</xsl:if>
         }
 
 
-        </xsl:for-each>
+     </xsl:for-each>
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/returnMessageContext.getEnvelope();
-             java.lang.Object object =
-                        <xsl:value-of select="$fullsupporterclassname"/>.fromOM(getElement(_returnEnv,"
-                        <xsl:value-of select="$style"/>"),
-                        <xsl:value-of select="$outputtype"/>.class);
-             return (
-                        <xsl:value-of select="$outputtype"/>)object;
-                    </xsl:otherwise>
-                </xsl:choose>
+             java.lang.Object object = <xsl:value-of select="$fullsupporterclassname"/>.fromOM(getElement(_returnEnv,"<xsl:value-of select="$style"/>"),<xsl:value-of select="$outputtype"/>.class);
+             return (<xsl:value-of select="$outputtype"/>)object;
+                 </xsl:otherwise>
+             </xsl:choose>
 
-                <!-- this needs to be changed -->
+            <!-- this needs to be changed -->
         }
-            </xsl:if>
-            <xsl:if test="$isAsync='1'">
+        </xsl:if>
+       trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,29 +1,25 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-    package
-        <xsl:value-of select="@package"/>;
+    package <xsl:value-of select="@package"/>;
 
     /**
      *  Auto generated supporter class for XML beans by the Axis code generator
      */
 
-    public  <xsl:if test="$isAsync='1'">
          /**
          * Auto generated method signature
-         * @see
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$interfaceName"/>#start
-                <xsl:value-of select="@name"/>
-         *
-                <xsl:if test="$inputtype!=''">@param
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>
+         * @see <xsl:value-of select="$package"/>.<xsl:value-of select="$interfaceName"/>#start<xsl:value-of select="@name"/>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public  void start
-                <xsl:value-of select="@name"/>(
-                <xsl:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>,
-                </xsl:if>final
-                <xclass
-        <xsl:value-of select="@name"/> {
-        <xsl:apply-templates/>
+    public class <xsl:value-of select="@name"/> {
+             <xsl:apply-templates />
 
           public static org.apache.xmlbeans.XmlObject fromOM(org.apache.axis2.om.OMElement param,
                java.lang.Class type){
                 try{
-        <xsl:for-each select="param">
-            <xsl:if test="@type!=''">
-                    if (
-                <xsl:value-of select="@type"/>.class.equals(type)){
-                        return
-                <xsl:value-of select="@type"/>.Factory.parse(param.getXMLStreamReader()) ;
+                    <xsl:for-each select="param">
+                    <xsl:if test="@type!=''">
+                    if (<xsl:value-of select="@type"/>.class.equals(type)){
+                        return <xsl:value-of select="@type"/>.Factory.parse(param.getXMLStreamReader()) ;
                     }
-            </xsl:if>
-        </xsl:for-each>
+                    sl:value-of select="$package"/>.
-                <xsl:value-of select="$callbackname"/> callback) throws java.rmi.RemoteException{
+        public  void start<xsl:value-of select="@name"/>(<xsl:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of>,</xsl:if>final <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/> callback) throws java.rmi.RemoteException{
              org.apache.axis2.clientapi.Call _call = new org.apache.axis2.clientapi.Call(_serviceContext);<!-- this needs to change -->
  		     org.apache.axis2.context.MessageContext _messageContext = getMessageContext();
              _call.setTo(this.toEPR);
-            _call.setSoapAction("
-                <xsl:value-of select="$soapAction"/>");
+            _call.setSoapAction("<xsl:value-of select="$soapAction"/>");
              org.apache.axis2.soap.SOAPEnvelope env = createEnvelope();
-                <xsl:choose>
-                     </xsl:if>
+                    </xsl:for-each>
                  }catch(java.lang.Exception e){
                     throw new RuntimeException("Data binding error",e);
                 }
@@ -34,20 +30,18 @@
         // Caution - need some manual editing to work properly
          public static org.apache.xmlbeans.XmlObject getTestObject(java.lang.Class type){
                 try{
-        <xsl:for-each select="param">
-            <xsl:if test="@type!=''">
-                    if (
-                <xsl:value-of select="@type"/>.class.equals(type)){
-                <xsl:value-of select="@type"/> emptyObject=
-                <xsl:value-of select="@type"/>.Factory.newInstance();
+                   <xsl:for-each select="param">
+                    <xsl:if test="@type!=''">
+                    if (<xsl:value-of select="@type"/>.class.equals(type)){
+                        <xsl:value-of select="@type"/> emptyObject= <xsl:value-of select="@type"/>.Factory.newInstance();
                  <xsl:when test="$inputtype!=''">
-                        <xsl:choose>
-                            <xsl:when test="$style='rpc'">
+             <xsl:choose>
+              <xsl:when test="$inputtype!=''">
+              <xsl:choose>
+               <xsl:when test="$style='rpc'">
                        // Style is RPC
                              setValueRPC(env,
-                            "
-                                <xsl:value-of select="@namespace"/>",
-                            "
-                                <xsl:value-of select="@name"/>",
-                            new String[]{"
-                                <xsl:value-of select="$inputparam"/>"},
-                            new Object[]{
-                                <xsl:value-of select="$inputparam"/>});
-                            </xsl:when>
-                            <!-- The follwing code is specific to XML beans-->
-                            <xsl:when test="$style='doc'">
+                             ////////////////////////////////////////////////
                         // TODO
                         // Fill in the empty object with necessaey values. Empty XMLBeans objects do not generate proper events
                         ////////////////////////////////////////////////
                         return emptyObject;
                     }
-            </xsl:if>
-        </xsl:for-each>
+                     </xsl:if>
+                    </xsl:for-each>
                  }catch(java.lang.Exception e){
                    throw new RuntimeException("Test object creation failure",e);
                 }
@@ -55,11 +49,10 @@
           }
      }
     </xsl:template>
-
+    
     <xsl:template match="param">
         <xsl:if test="@type!=''">
-          public  static org.apache.axis2.om.OMElement  toOM(
-            <xsl:value-of select="@type"/> param){
+          public  static org.apache.axis2.om.OMElement  toOM(<xsl:value-of select="@type"/> param){
 		    org.apache.a      "<xsl:value-of select="@namespace"/>",
+                            "<xsl:value-of select="@name"/>",
+                            new String[]{"<xsl:value-of select="$inputparam"/>"},
+                            new Object[]{<xsl:value-of select="$inputparam"/>});
+                      </xsl:when>
+                      <!-- The follwing code is specific to XML beans-->
+                      <xsl:when test="$style='doc'">
                          //Style is Doc
-                       setValueDoc(env,
-                                <xsl:value-of select="$fullsupporterclassname"/>.toOM(
-                                <xsl:value-of select="$inputparam"/>));
-                            </xsl:when>
-                            <xsl:otherwise>
+                       setValueDoc(env,<xsl:value-of select="$fullsupporterclassname"/>.toOM(<xsl:value-of select="$inputparam"/>));
+                      </xsl:when>
+                      <xsl:otherwise>
                           //Unknowxis2.om.impl.llom.builder.StAXOMBuilder builder = org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory.createStAXOMBuilder
             (org.apache.axis2.om.OMAbstractFactory.getOMFactory(),new org.apache.axis2.clientapi.StreamWrapper(param.newXMLStreamReader())) ;
 		    org.apache.axis2.om.OMElement documentElement = builder.getDocumentElement();
@@ -67,6 +60,6 @@
             documentElement.build();
             return documentElement;
           }
-        </xsl:if>
+       </xsl:if>
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file



n style!! No code is generated
                           throw UnsupportedOperationException("Unknown Style");
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:choose>
-                            <xsl:when test="$style='rpc'">
+                      </xsl:otherwise>
+                  </xsl:choose>
+              </xsl:when>
+              <xsl:otherwise>
+                   <xsl:choose>
+                   <xsl:when test="$style='rpc'">
                        //Style is RPC. No input parameters
                           setValueRPC(env,
-                            "
-                                <xsl:value-of select="@namespace"/>",
-                            "
-                                <xsl:value-of select="@name"/>",
+                            "<xsl:value-of select="@namespace"/>",
+                            "<xsl:value-of select="@name"/>",
                             null,
                             null);
-                            </xsl:when>
-                            <!-- The follwing code is specific to XML beans-->
-                            <xsl:when test="$style='doc'">
+                      </xsl:when>
+                      <!-- The follwing code is specific to XML beans-->
+                      <xsl:when test="$style='doc'">
                        //Style is Doc. No input parameters
                        setValueDoc(env,null);
-                            </xsl:when>
-                            <xsl:otherwise>
+                      </xsl:when>
+                      <xsl:otherwise>
                          //Unknown style!! No code is generated
                           throw UnsupportedOperationException("Unknown Style");
-                            </xsl:otherwise>
-                        </xsl:choose>
+                      </xsl:otherwise>
+                  </xsl:choose>
 
-                    </xsl:otherwise>
-                </xsl:choose>
+             </xsl:otherwise>
+            </xsl:choose>
              _messageContext.setEnvelope(env);
-		      _call.invokeNonBlocking(_operations[
-                <xsl:value-of select="position()-1"/>], _messageContext, new org.apache.axis2.clientapi.Callback(){
+		      _call.invokeNonBlocking(_operations[<xsl:value-of select="position()-1"/>], _messageContext, new org.apache.axis2.clientapi.Callback(){
                    public void onComplete(org.apache.axis2.clientapi.AsyncResult result){
-                         callback.receiveResult
-                <xsl:value-of select="@name"/>(result);
+                         callback.receiveResult<xsl:value-of select="@name"/>(result);
                    }
                    public void reportError(java.lang.Exception e){
-                         callback.receiveError
-                <xsl:value-of select="@name"/>(e);
+                         callback.receiveError<xsl:value-of select="@name"/>(e);
                    }
 
               }
             );
 
-                <!-- this needs to be changed -->
+            <!-- this needs to be changed -->
         }
-            </xsl:if>
-        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,79 +1,38 @@
 <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="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAsync"/>
-        </xsl:variable>
-        <xsl:variable name="callbackname">
-            <xsl:value-of select="@callbackname"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
+    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
 
-    package
-        <xsl:value-of select="$package"/>;
+    package <xsl:value-of select="$package"/>;
 
     /*
      *  Auto generated java interface by the Axis code generator
      */
 
-    public interface
-        <xsl:value-of select="@name"/> {
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
+    public interface <xsl:value-of select="@name"></xsl:value-of> {
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
 
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:if test="$isSync='1'">
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:if test="$isSync='1'">
         /**
          * Auto generated method signature 
-         *
-                <xsl:if test="$inputtype!=''">@param
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public
-                <xsl:if test="$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:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>) throws java.rmi.RemoteException;
-            </xsl:if>
-            <xsl:if test="$isAsync='1'">
+        public  <xsl:if test="$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:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>) throws java.rmi.RemoteException;
+        </xsl:if>
+        <xsl:if test="$isAsync='1'">
          /**
          * Auto generated method signature
-         *
-                <xsl:if test="$inputtype!=''">@param
-                    <xsl:value-of select="$inputparam"/>
-                </xsl:if>
+         *<xsl:if test="$inputtype!=''">@param <xsl:value-of select="$inputparam"></xsl:value-of></xsl:if>
          */
-        public  void start
-                <xsl:value-of select="@name"/>(
-                <xsl:if test="$inputtype!=''">
-                    <xsl:value-of select="$inputtype"/>
-                    <xsl:text> </xsl:text>
-                    <xsl:value-of select="$inputparam"/>,
-                </xsl:if>final
-                <xsl:value-of select="$package"/>.
-                <xsl:value-of select="$callbackname"/> callback) throws java.rmi.RemoteException;
-            </xsl:if>
-        </xsl:for-each>
+        public  void start<xsl:value-of select="@name"/>(<xsl:if test="$inputtype!=''"><xsl:value-of select="$inputtype"/><xsl:text> </xsl:text><xsl:value-of select="$inputparam"></xsl:value-of>,</xsl:if>final <xsl:value-of select="$package"/>.<xsl:value-of select="$callbackname"/> callback) throws java.rmi.RemoteException;
+        </xsl:if>
+     </xsl:for-each>
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl?rev=224703&r1=224702&r2=224703&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/LocalTestClassTemplate.xsl Mon Jul 25 02:00:27 2005
@@ -1,35 +1,16 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="text"/>
     <xsl:template match="/class">
-        <xsl:variable name="interfaceName">
-            <xsl:value-of select="@interfaceName"/>
-        </xsl:variable>
-        <xsl:variable name="package">
-            <xsl:value-of select="@package"/>
-        </xsl:variable>
-        <xsl:variable name="implpackage">
-            <xsl:value-of select="@implpackage"/>
-        </xsl:variable>
-        <xsl:variable name="callbackname">
-            <xsl:value-of select="@callbackname"/>
-        </xsl:variable>
-        <xsl:variable name="stubname">
-            <xsl:value-of select="@stubname"/>
-        </xsl:variable>
-        <xsl:variable name="isSync">
-            <xsl:value-of select="@isSync"/>
-        </xsl:variable>
-        <xsl:variable name="isAsync">
-            <xsl:value-of select="@isAsync"/>
-        </xsl:variable>
-        <xsl:variable name="address">
-            <xsl:value-of select="@address"/>
-        </xsl:variable>
-        <xsl:variable name="servicexmlpath">
-            <xsl:value-of select="@servicexmlpath"/>
-        </xsl:variable>
-    package
-        <xsl:value-of select="$package"/>;
+    <xsl:variable name="interfaceName"><xsl:value-of select="@interfaceName"/></xsl:variable>
+    <xsl:variable name="package"><xsl:value-of select="@package"/></xsl:variable>
+    <xsl:variable name="implpackage"><xsl:value-of select="@implpackage"/></xsl:variable>
+    <xsl:variable name="callbackname"><xsl:value-of select="@callbackname"/></xsl:variable>
+    <xsl:variable name="stubname"><xsl:value-of select="@stubname"/></xsl:variable>
+    <xsl:variable name="isSync"><xsl:value-of select="@isSync"/></xsl:variable>
+    <xsl:variable name="isAsync"><xsl:value-of select="@isAsync"/></xsl:variable>
+    <xsl:variable name="address"><xsl:value-of select="@address"/></xsl:variable>
+    <xsl:variable name="servicexmlpath"><xsl:value-of select="@servicexmlpath"/></xsl:variable>
+    package <xsl:value-of select="$package"/>;
     
 	import java.io.InputStream;
 	import java.net.ServerSocket;
@@ -52,8 +33,7 @@
      *  Auto generated Junit test case by the Axis code generator
     */
 
-    public class
-        <xsl:value-of select="@name"/> extends junit.framework.TestCase{
+    public class <xsl:value-of select="@name"/> extends junit.framework.TestCase{
     
     
     private static int count = 0;
@@ -65,16 +45,11 @@
 					.getProperty("user.dir"));
 			AxisConfiguration axisConfig = deploymentEngine.load();
 			ClassLoader classLoader = this.getClass().getClassLoader();
-			classLoader.getResource("
-        <xsl:value-of select="$implpackage"/>.
-        <xsl:value-of select="$interfaceName"/>");
-			classLoader.getResource("
-        <xsl:value-of select="$implpackage"/>.
-        <xsl:value-of select="$stubname"/>");
+			classLoader.getResource("<xsl:value-of select="$implpackage"/>.<xsl:value-of select="$interfaceName"/>");
+			classLoader.getResource("<xsl:value-of select="$implpackage"/>.<xsl:value-of select="$stubname"/>");
 			ClassLoader cl = Thread.currentThread().getContextClassLoader();
 			InputStream in = cl
-					.getResourceAsStream("
-        <xsl:value-of select="$servicexmlpath"/>");
+					.getResourceAsStream("<xsl:value-of select="$servicexmlpath"/>");
 			ServiceDescription service = new ServiceDescription();
 			deploymentEngine.buildService(service, in, classLoader);
 			
@@ -109,119 +84,82 @@
     }
 
 
-        <xsl:for-each select="method">
-            <xsl:variable name="outputtype">
-                <xsl:value-of select="output/param/@type"/>
-            </xsl:variable>
-            <xsl:variable name="inputtype">
-                <xsl:value-of select="input/param/@type"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:variable name="inputparam">
-                <xsl:value-of select="input/param/@name"/>
-            </xsl:variable>  <!-- this needs to change-->
-            <xsl:if test="$isSync='1'">
+     <xsl:for-each select="method">
+         <xsl:variable name="outputtype"><xsl:value-of select="output/param/@type"></xsl:value-of></xsl:variable>
+         <xsl:variable name="inputtype"><xsl:value-of select="input/param/@type"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:variable name="inputparam"><xsl:value-of select="input/param/@name"></xsl:value-of></xsl:variable>  <!-- this needs to change-->
+         <xsl:if test="$isSync='1'">
 
         /**
          * Auto generated test method
          */
-        public  void test
-                <xsl:value-of select="@name"/>() throws java.lang.Exception{
+        public  void test<xsl:value-of select="@name"/>() throws java.lang.Exception{
 
-                <xsl:value-of select="$implpackage"/>.
-                <xsl:value-of select="$stubname"/> stub = new
-                <xsl:value-of select="$implpackage"/>.
-                <xsl:value-of select="$stubname"/>(".","
-                <xsl:value-of select="$address"/>/
-                <xsl:value-of select="@name"/>");
-                <xsl:choose>
-                    <xsl:when test="$inputtype!=''">
-               assertNotNull(stub.
-                        <xsl:value-of select="@name"/>(
-                                (
-                        <xsl:value-of select="$inputtype"/>)createTestInput(
-                        <xsl:value-of select="$inputtype"/>.class)));//this should come as a type
-                    </xsl:when>
-                    <xsl:otherwise>
-               // assertNotNull(stub.
-                        <xsl:value-of select="@name"/>());
-                    </xsl:otherwise>
-                </xsl:choose>
+        <xsl:value-of select="$implpackage"/>.<xsl:value-of select="$stubname"/> stub = new <xsl:value-of select="$implpackage"/>.<xsl:value-of select="$stubname"/>(".","<xsl:value-of select="$address"/>/<xsl:value-of select="@name"/>");
+           <xsl:choose>
+             <xsl:when test="$inputtype!=''">
+               assertNotNull(stub.<xsl:value-of select="@name"/>(
+                                (<xsl:value-of select="$inputtype"/>)createTestInput(<xsl:value-of select="$inputtype"/>.class)));//this should come as a type
+              </xsl:when>
+              <xsl:otherwise>
+               // assertNotNull(stub.<xsl:value-of select="@name"/>());
+             </xsl:otherwise>
+            </xsl:choose>
 
 
 
         }
-            </xsl:if>
-            <xsl:if test="$isAsync='1'">
-                <xsl:variable name="tempCallbackName">tempCallback
-                    <xsl:value-of select="generate-id()"/>
-                </xsl:variable>
+        </xsl:if>
+        <xsl:if test="$isAsync='1'">
+            <xsl:variable name="tempCallbackName">tempCallback<xsl:value-of select="generate-id()"/></xsl:variable>
          /**
          * Auto generated test method
          */
-        public  void testStart
-                <xsl:value-of select="@name"/>() throws java.lang.Exception{
-                <xsl:value-of select="$implpackage"/>.
-                <xsl:value-of select="$stubname"/> stub = new
-                <xsl:value-of select="$implpackage"/>.
-                <xsl:value-of select="$stubname"/>();
-                <xsl:choose>
-                    <xsl:when test="$inputtype!=''">
-                stub.start
-                        <xsl:value-of select="@name"/>(
-                   (
-                        <xsl:value-of select="$inputtype"/>)createTestInput(
-                        <xsl:value-of select="$inputtype"/>.class),
-                    new
-                        <xsl:value-of select="$tempCallbackName"/>()
+        public  void testStart<xsl:value-of select="@name"/>() throws java.lang.Exception{
+            <xsl:value-of select="$implpackage"/>.<xsl:value-of select="$stubname"/> stub = new <xsl:value-of select="$implpackage"/>.<xsl:value-of select="$stubname"/>();
+             <xsl:choose>
+             <xsl:when test="$inputtype!=''">
+                stub.start<xsl:value-of select="@name"/>(
+                   (<xsl:value-of select="$inputtype"/>)createTestInput(<xsl:value-of select="$inputtype"/>.class),
+                    new <xsl:value-of select="$tempCallbackName"/>()
                 );
-                    </xsl:when>
-                    <xsl:otherwise>
-                stub.start
-                        <xsl:value-of select="@name"/>(
-                    new
-                        <xsl:value-of select="$tempCallbackName"/>()
+              </xsl:when>
+              <xsl:otherwise>
+                stub.start<xsl:value-of select="@name"/>(
+                    new <xsl:value-of select="$tempCallbackName"/>()
                 );
-                    </xsl:otherwise>
-                </xsl:choose>
+             </xsl:otherwise>
+            </xsl:choose>
 
 
         }
 
-        private class
-                <xsl:value-of select="$tempCallbackName"/>  extends
-                <xsl:value-of select="$implpackage"/>.
-                <xsl:value-of select="$callbackname"/>{
-            public
-                <xsl:value-of select="$tempCallbackName"/>(){ super(null);}
+        private class <xsl:value-of select="$tempCallbackName"/>  extends <xsl:value-of select="$implpackage"/>.<xsl:value-of select="$callbackname"/>{
+            public <xsl:value-of select="$tempCallbackName"/>(){ super(null);}
 
-            public void receiveResult
-                <xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
+            public void receiveResult<xsl:value-of select="@name"/>(org.apache.axis2.clientapi.AsyncResult result) {
 			    assertNotNull(result.getResponseEnvelope().getBody().getFirstChild());
             }
 
-            public void receiveError
-                <xsl:value-of select="@name"/>(java.lang.Exception e) {
+            public void receiveError<xsl:value-of select="@name"/>(java.lang.Exception e) {
                 fail();
             }
 
         }
-            </xsl:if>
-        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
 
 
      public static Object createTestInput(Class paramClass){
 
       OMFactory factory = OMAbstractFactory.getOMFactory();
-		OMElement element = factory.createOMElement(new QName("http://soapinterop.org/", "
-        <xsl:value-of select="generate-id()"/>"), null);
-		OMElement element1 = factory.createOMElement(new QName("http://soapinterop.org/","
-        <xsl:value-of select="generate-id()"/>"), element);
+		OMElement element = factory.createOMElement(new QName("http://soapinterop.org/", "<xsl:value-of select="generate-id()"/>"), null);
+		OMElement element1 = factory.createOMElement(new QName("http://soapinterop.org/","<xsl:value-of select="generate-id()"/>"), element);
 		element.addChild(element1);
-    	OMTextImpl text = new OMTextImpl("
-        <xsl:value-of select="generate-id()"/>");
+    	OMTextImpl text = new OMTextImpl("<xsl:value-of select="generate-id()"/>");
     	element1.addChild(text);
     	return element;
     }
     }
     </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+ </xsl:stylesheet>
\ No newline at end of file



Mime
View raw message