an attempt to reinstate wsdl generation, not such a big deal after all

diff --git a/plcapi.spec b/plcapi.spec
index 3d63efc..0e90aa5 100644 (file)
--- a/plcapi.spec
+++ b/plcapi.spec
@@ -83,8 +83,7 @@ through Apache mod_python.
 # 
 # Build __init__.py metafiles and PHP API. 
 %{__make} %{?_smp_mflags}
-## turning off wsdl generation for now
-#%{__make} -C wsdl
+%{__make} -C wsdl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -111,10 +110,9 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
 cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
 chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/*
 
-## turning off wsdl generation for now
-## Install wsdl
-#echo "* Installing wsdl"
-#install -D -m 644 wsdl/plcapi.wsdl $RPM_BUILD_ROOT/var/www/html/wsdl/plcapi.wsdl
+# Install wsdl
+echo "* Installing wsdl"
+install -D -m 644 wsdl/plcapi.wsdl $RPM_BUILD_ROOT/var/www/html/wsdl/plcapi.wsdl
 
 ## Thierry - June 2013 - omfv6 does not require xmpp pubsub nodes management any more
 ## Install omf_slicemgr.py
@@ -143,8 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %config (noreplace) %{_datadir}/plc_api/PLC/Accessors/Accessors_site.py
 /etc/plc.d
 /etc/planetlab/db-config.d
-## turning off wsdl generation for now
-#/var/www/html/wsdl/plcapi.wsdl
+/var/www/html/wsdl/plcapi.wsdl
 #/usr/bin/omf_slicemgr.py*
 #/usr/bin/reset_xmpp_pubsub_nodes.py*
 /var/log/plc_api_ratelimit.log

diff --git a/wsdl/api2wsdl.py b/wsdl/api2wsdl.py
index 36866c9..00f16cd 100755 (executable)
--- a/wsdl/api2wsdl.py
+++ b/wsdl/api2wsdl.py
@@ -12,7 +12,6 @@ import os, sys
 import time
 import pdb
 import xml.dom.minidom
-import xml.dom.ext
 import inspect
 import globals
 
@@ -152,5 +151,5 @@ add_wsdl_ports_and_bindings(wsdl)
 add_wsdl_service(wsdl)
 
 
-xml.dom.ext.PrettyPrint(wsdl)
+print wsdl.toprettyxml()