fixed wsdl links and service name

SE/se-lib/Api/WsdlServer.php

@@ -28,23 +28,18 @@ class Api_WsdlServer extends Api_WfsServerBase {
       else throw new Exception("TODO: wsdl query: [".json_encode($request->query)."]");
     }
 
-    if (2 == $countSegments && 'wfs-http-bindings.wsdl' == $request->segments[1]) return $this->wsdlHttpBindingsAction();
+    if (2 == $countSegments && 'wfs-http-bindings.wsdl' == $request->segments[1]) return $this->wsdlHttpBindingsWsdl();
+    // if (2 == $countSegments && 'wfs-responses.wsdl' == $request->segments[1]) return $this->sendFile('wfs-responses.wsdl');
+    // if (2 == $countSegments && 'wfs-util.xsd' == $request->segments[1]) return $this->sendFile('wfs-util.xsd');
+    // if (2 == $countSegments && 'wfs-xml-interfaces.wsdl' == $request->segments[1]) return $this->sendFile('wfs-xml-interfaces.wsdl');
+    // if (2 == $countSegments && 'wfs.xsd' == $request->segments[1]) return $this->sendFile('wfs.xsd');
 
     throw new Exception("TODO: \$segments({$countSegments}): [".implode(", ", $request->segments)."]");
   }
 
-  public function wsdlWfsResponseAction() {
-    $wsdlUri = Request::getHostUri() . "/wfs-data.php?wsdl";
-		$wsdlServiceName = "WFS-" . Request::getHostUri();// WFS-www.myservice.com
-		$serviceUrlBase = Request::getPathUri() . "wfs-data.php/wsdl";
-    $staticWsdlUrlBase = Request::getPathUri() . "schema/wsdl";
-		$soapBinding = false;
-		$httpBinding = true;
-		$kvpBinding = false;
-		echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
-?>
-<TODO>wfs-responses.wsdl</TODO>
-<?php
+  public function sendFile($file) {
+    header('Content-type: application/xml; charset="utf-8"');
+    echo file_get_contents(APP_PATH_SCHEMA . '/wsdl/' . $file);
   }
 
   public function wsdlXmlInterfacesAction() {
@@ -55,6 +50,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
 		$soapBinding = false;
 		$httpBinding = true;
 		$kvpBinding = false;
+    header('Content-type: application/xml; charset="utf-8"');
 		echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
 ?>
 <wsdl:definitions
@@ -184,12 +180,12 @@ class Api_WsdlServer extends Api_WfsServerBase {
 <?php
   }
 
-  public function wsdlHttpBindingsAction() {
+  public function wsdlHttpBindingsWsdl() {
     $wsdlUri = Request::getHostUri() . "/wfs-data.php?wsdl";
 		$wsdlServiceName = "WFS-" . Request::getHostUri();// WFS-www.myservice.com
 		$serviceUrlBase = Request::getPathUri() . "wfs-data.php/wsdl";
     $staticWsdlUrlBase = Request::getPathUri() . "schema/wsdl";
-    $wfsServerUriBase = Request::getPathUri() . "wfs-data.php?version=1.0.0&service=WFS";
+    $wfsServerUriBase = Request::getPathUri() . "wfs-data.php?version=1.0.0&amp;service=WFS";
 		echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
 ?>
 <wsdl:definitions
@@ -212,7 +208,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
       </wsdl:documentation>
       <http:binding verb="POST"/>
       <wsdl:operation name="wfs.getCapabilities">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=getCapabilities"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=getCapabilities"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -224,7 +220,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.describeFeatureType">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=DescribeFeatureType"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=DescribeFeatureType"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -236,7 +232,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.getPropertyValue">
-        <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=getPropertyValue"/>
+        <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=getPropertyValue"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -248,7 +244,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.getFeature">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=getFeature"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=getFeature"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -260,7 +256,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.getFeatureWithLock">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=getFeatureWithLock"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=getFeatureWithLock"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -272,7 +268,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.lockFeature">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=lockFeature"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=lockFeature"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -284,7 +280,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.transaction">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=transaction"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=transaction"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -296,7 +292,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.listStoredQueries">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=listStoredQueries"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=listStoredQueries"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -308,7 +304,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.describeStoredQueries">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=describeStoredQueries"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=describeStoredQueries"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -320,7 +316,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.createStoredQuery">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=createStoredQuery"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=createStoredQuery"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -332,7 +328,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
          </wsdl:fault>
       </wsdl:operation>
       <wsdl:operation name="wfs.dropStoredQuery">
-         <http:operation location="<?= $wfsServerUriBase; ?>&REQUEST=dropStoredQuery"/>
+         <http:operation location="<?= $wfsServerUriBase; ?>&amp;REQUEST=dropStoredQuery"/>
          <wsdl:input>
             <mime:mimeXml/>
          </wsdl:input>
@@ -350,7 +346,7 @@ class Api_WsdlServer extends Api_WfsServerBase {
 
   public function wsdlAction() {// wsdl endpoints(ports)
 		$wsdlUri = Request::getHostUri() . "/wfs-data.php?wsdl";
-		$wsdlServiceName = "WFS-" . Request::getHostUri();// WFS-www.myservice.com
+		$wsdlServiceName = "WFS-" . Request::getHost();// WFS-www.myservice.com
 		$serviceUrlBase = Request::getPathUri() . "wfs-data.php/wsdl";
     $staticWsdlUrlBase = Request::getPathUri() . "schema/wsdl";
 		$soapBinding = false;