[wsf-c-dev] svn commit r698 - wsf/php/src/scripts

[svn at wso2.com]

Author: buddhika
Date: Sun Feb  4 19:20:13 2007
New Revision: 698

Modified:
   wsf/php/src/scripts/WS_WsdlConsts.php
   wsf/php/src/scripts/WS_WsdlMessage.php
   wsf/php/src/scripts/WS_WsdlPort.php
Log:
fixing bugs in wsdl generation


Modified: wsf/php/src/scripts/WS_WsdlConsts.php
==============================================================================
--- wsf/php/src/scripts/WS_WsdlConsts.php	(original)
+++ wsf/php/src/scripts/WS_WsdlConsts.php	Sun Feb  4 19:20:13 2007
@@ -99,10 +99,9 @@
     
     
     const WS_WSDL_PORTTYPE_ATTR_NAME ='portType';
-//    const WS_WSDL_PORT_TYPE_TNS_TAG = 's0:';
       
     const WS_WSDL_PATTERN_ATTR_NAME = "pattern";
-    
+    const WS_WSDL_PARAMETERS_ATTR_NAME = "parameters";
 
     const WS_WSDL_NAMESPACE_ATTR_NAME = 'ns';
     const WS_WSDL_WSDLTYPE_ATTR_NAME = 'wsdlType';
@@ -121,7 +120,7 @@
     const WS_WSDL_ALL_ATTR_NAME = 'all';
     const WS_WSDL_SEQUENCE_ATTR_NAME = 'sequence';
     const WS_WSDL_XSD_ATTR_NAME = 'xsd:';
-    const WS_WSDL_RESPONSE_ATTR_NAME = 'response';
+    const WS_WSDL_RESPONSE_ATTR_NAME = 'Response';
     const WS_WSDL_IN_ATTR_NAME = 'In';
     const WS_WSDL_OUT_ATTR_NAME = 'Out';
     const WS_WSDL_ELEMENTFROMDEFAULT_ATTR_NAME = 'elementFromDefault';

Modified: wsf/php/src/scripts/WS_WsdlMessage.php
==============================================================================
--- wsf/php/src/scripts/WS_WsdlMessage.php	(original)
+++ wsf/php/src/scripts/WS_WsdlMessage.php	Sun Feb  4 19:20:13 2007
@@ -47,16 +47,17 @@
 		 $part = $msg_doc->createElementNS(WS_WsdlConst::WS_SCHEMA_WSDL_NAMESPACE,
 						   WS_WsdlConst::WS_WSDL_PART_ATTR_NAME);
 		 $part->setAttribute(WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME,
-				     "parameters");
-		 if ("Input" == ucfirst($type))
+				     WS_WsdlConst::WS_WSDL_PARAMETERS_ATTR_NAME);
+		 
+		 if (ucfirst(WS_WsdlConst::WS_WSDL_INPUT_ATTR_NAME) == ucfirst($type))
 		 {
 		     $part->setAttribute(WS_WsdlConst::WS_WSDL_ELEMENT_ATTR_NAME,
 				     $name);
 		 }
-		 if ("Output" == ucfirst($type))
+		 if (ucfirst(WS_WsdlConst::WS_WSDL_OUTPUT_ATTR_NAME) == ucfirst($type))
 		 {
 		     $part->setAttribute(WS_WsdlConst::WS_WSDL_ELEMENT_ATTR_NAME,
-				     $name."Response");
+				     $name.WS_WSDL_REPONSE_ATTR_NAME);
 		 }
 		     
 		 $el->appendChild($part);
@@ -79,7 +80,7 @@
 						 WS_WsdlConst::WS_WSDL_MESSAGE_ATTR_NAME);
 		 $el->setAttribute(WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME,
 				   "$name1".ucfirst($name2));
-		 if ($name2 == "input")
+		 if ($name2 == WS_WsdlConst::WS_WSDL_INPUT_ATTR_NAME)
 		 {
 		     foreach($params3 as $name3 => $params4)
 		     {
@@ -87,18 +88,18 @@
 							   WS_WsdlConst::WS_WSDL_PART_ATTR_NAME);
  			 foreach ($params4 as $name4 => $param5)
  			 {
-			     if ($name4 == "name")
+			     if ($name4 == WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME)
 				 $part->setAttribute(WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME,
 						 $param5);
-			     if ($name4 == "type")
+			     if ($name4 == WS_WsdlConst::WS_WSDL_TYPE_ATTR_NAME)
 				 $part->setAttribute(WS_WsdlConst::WS_WSDL_TYPE_ATTR_NAME,
 						     $param5);
-			 $el->appendChild($part);
+			     $el->appendChild($part);
 		     
  			 }
 		     }
 		 }
-		 if ($name2 == "output")
+		 if ($name2 == WS_WsdlConst::WS_WSDL_OUTPUT_ATTR_NAME)
 		 {
 		     foreach($params3 as $name3 => $params4)
                      {
@@ -106,10 +107,10 @@
                                                            WS_WsdlConst::WS_WSDL_PART_ATTR_NAME);
                          foreach ($params4 as $name4 => $param5)
                          {
-                             if ($name4 == "name")
+                             if ($name4 == WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME)
                                  $part->setAttribute(WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME,
 						     $param5);
-                             if ($name4 == "type")
+                             if ($name4 == WS_WsdlConst::WS_WSDL_TYPE_ATTR_NAME)
                                  $part->setAttribute(WS_WsdlConst::WS_WSDL_TYPE_ATTR_NAME,
                                                      $param5);
 			     $el->appendChild($part);

Modified: wsf/php/src/scripts/WS_WsdlPort.php
==============================================================================
--- wsf/php/src/scripts/WS_WsdlPort.php	(original)
+++ wsf/php/src/scripts/WS_WsdlPort.php	Sun Feb  4 19:20:13 2007
@@ -30,7 +30,7 @@
      public function createPortType(DomDocument $port_doc, DomElement $port_root)
      {
 	 $port_el = $port_doc->createElementNS( WS_WsdlConst::WS_SCHEMA_WSDL_NAMESPACE, 
-						WS_WsdlConst::WS_WSDL_TYPE_ATTR_NAME);
+						WS_WsdlConst::WS_WSDL_PORTTYPE_ATTR_NAME);
 	 $port_el->setAttribute(WS_WsdlConst::WS_WSDL_NAME_ATTR_NAME, $this->service_name);
 	 foreach($this->operations as $name => $params)
 	 {