HPCC-18772 Replace configurator with XSLT in docs build

configurator was used to generate xml from xsd for docs build.
For better maintenance saxon with XSLT 2.0 script is used to replace configurator.
Move XML delcaration to the top

CMakeLists.txt

@@ -161,38 +161,29 @@ if ( PLUGIN )
     HPCC_ADD_SUBDIRECTORY (plugins/mysql "MYSQLEMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/exampleplugin "EXAMPLEPLUGIN")
     HPCC_ADD_SUBDIRECTORY (plugins/couchbase "COUCHBASEEMBED")
-elseif ( NOT MAKE_DOCS_ONLY OR MAKE_CONFIGURATOR )
+elseif ( NOT MAKE_DOCS_ONLY )
     HPCC_ADD_SUBDIRECTORY (system)
-
-    if ( NOT MAKE_DOCS_ONLY )
-        HPCC_ADD_SUBDIRECTORY (initfiles)
-        HPCC_ADD_SUBDIRECTORY (tools)
-        HPCC_ADD_SUBDIRECTORY (common)
-        HPCC_ADD_SUBDIRECTORY (dali)
-        HPCC_ADD_SUBDIRECTORY (deploy)
-        HPCC_ADD_SUBDIRECTORY (deployment)
-        HPCC_ADD_SUBDIRECTORY (ecl)
-        HPCC_ADD_SUBDIRECTORY (ecllibrary)
-        HPCC_ADD_SUBDIRECTORY (esp)
-        HPCC_ADD_SUBDIRECTORY (plugins)
-        HPCC_ADD_SUBDIRECTORY (roxie)
-        HPCC_ADD_SUBDIRECTORY (rtl)
-        HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
-        HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
-        HPCC_ADD_SUBDIRECTORY (testing)
-
-        if ( WIN32 )
-            HPCC_ADD_SUBDIRECTORY (clienttools/IDEPlugins "CLIENTTOOLS_ONLY")
-        else()
-            HPCC_ADD_SUBDIRECTORY (clienttools "CLIENTTOOLS_ONLY")
-        endif()
-
-    endif ( NOT MAKE_DOCS_ONLY )
-
-    if ( MAKE_CONFIGURATOR )
-        MESSAGE(STATUS "Configurator app build ON")
-        HPCC_ADD_SUBDIRECTORY (configuration)
-    endif()
+    HPCC_ADD_SUBDIRECTORY (initfiles)
+    HPCC_ADD_SUBDIRECTORY (tools)
+    HPCC_ADD_SUBDIRECTORY (common)
+    HPCC_ADD_SUBDIRECTORY (dali)
+    HPCC_ADD_SUBDIRECTORY (deploy)
+    HPCC_ADD_SUBDIRECTORY (deployment)
+    HPCC_ADD_SUBDIRECTORY (ecl)
+    HPCC_ADD_SUBDIRECTORY (ecllibrary)
+    HPCC_ADD_SUBDIRECTORY (esp)
+    HPCC_ADD_SUBDIRECTORY (plugins)
+    HPCC_ADD_SUBDIRECTORY (roxie)
+    HPCC_ADD_SUBDIRECTORY (rtl)
+    HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
+    HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
+    HPCC_ADD_SUBDIRECTORY (testing)
+
+    if ( WIN32 )
+        HPCC_ADD_SUBDIRECTORY (clienttools/IDEPlugins "CLIENTTOOLS_ONLY")
+    else()
+        HPCC_ADD_SUBDIRECTORY (clienttools "CLIENTTOOLS_ONLY")
+   endif()
 endif()
 
 HPCC_ADD_SUBDIRECTORY(docs "PLATFORM")

cmake_modules/FindSAXON.cmake

@@ -0,0 +1,44 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    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.
+################################################################################
+
+
+# - Try to find the xsltproc executable
+#
+#  SAXON_FOUND - system has the saxon executable.
+#  SAXON_EXECUTABLE - the runtime path of the saxon executable
+
+if (NOT SAXON_FOUND)
+  IF (WIN32)
+    SET (saxon "transform.exe")
+  ELSE()
+    SET (saxon "saxonb-xslt")
+  ENDIF()
+
+  IF (NOT "${EXTERNALS_DIRECTORY}" STREQUAL "")
+    FIND_PROGRAM(SAXON_EXECUTABLE ${saxon} PATHS "${EXTERNALS_DIRECTORY}")
+  ENDIF()
+
+  if (USE_NATIVE_LIBRARIES)
+    # if we didn't find in externals, look in system include path
+    FIND_PROGRAM(SAXON_EXECUTABLE ${saxon})
+  endif()
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SAXON DEFAULT_MSG
+    SAXON_EXECUTABLE
+  )
+  MARK_AS_ADVANCED(SAXON_EXECUTABLE)
+ENDIF()

cmake_modules/commonSetup.cmake

@@ -116,15 +116,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(INCLUDE_PY3EMBED "Configure use of py3embed with standard platform package" ON)
 
 
-  option(MAKE_CONFIGURATOR "Build Configurator" ON)
-  option(CONFIGURATOR_LIB "Build Configurator static library (.a)" OFF)
 
-  if ( CONFIGURATOR_LIB )
-        set( MAKE_CONFIGURATOR ON )
-  endif()
-
-
-    MACRO(SET_PLUGIN_PACKAGE plugin)
+     MACRO(SET_PLUGIN_PACKAGE plugin)
         string(TOLOWER "${plugin}" pname)
 	    if(DEFINED pluginname)
             message(FATAL_ERROR "Cannot enable ${pname}, already declared ${pluginname}")
@@ -703,13 +696,15 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
       message(FATAL_ERROR "FOP requested but package not found")
     ENDIF()
 
-    if (DOCS_AUTO)
-       if ("${CONFIGURATOR_DIRECTORY}" STREQUAL "")
-         set(MAKE_CONFIGURATOR ON)
-         set(JLIB_ONLY ON)
-         set  (CONFIGURATOR_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-       endif()
-    endif()
+    IF ( DOCS_AUTO )
+      find_package(SAXON)
+      IF (SAXON_FOUND)
+        add_definitions (-D_USE_SAXON)
+      ELSE()
+        message(FATAL_ERROR "SAXON, a XSLT and XQuery processor, is required for documentation build but not found.")
+      ENDIF()
+    ENDIF()
+
   ENDIF(MAKE_DOCS)
 
   IF ( NOT MAKE_DOCS_ONLY )

cmake_modules/docMacros.cmake

@@ -122,7 +122,7 @@ MACRO(DOCBOOK_TO_HTML _xsl_file _xml_file _out_dir _html_target _css_path _zip_t
            OUTPUT ${_out_dir}/${css_file_name}
            )
        ADD_CUSTOM_TARGET(${_html_target}
-           COMMAND xsltproc --nonet --xinclude --stringparam html.stylesheet ${css_file_name} --stringparam generate.toc "book toc"  --param use.id.as.filename 1 --param chapter.autolabel 0  ${_xsl_file} ${_xml_file}
+           COMMAND ${XSLTPROC_EXECUTABLE} --nonet --xinclude --stringparam html.stylesheet ${css_file_name} --stringparam generate.toc "book toc"  --param use.id.as.filename 1 --param chapter.autolabel 0  ${_xsl_file} ${_xml_file}
            WORKING_DIRECTORY ${_out_dir}
            DEPENDS docbook-expand ${_out_dir}/${css_file_name} ${HELP_DEPENDENCIES}
            #SOURCES ${_xsl_file}
@@ -162,11 +162,13 @@ MACRO(XSD_TO_XML _xsd_files _in_dir _out_dir)
                 OUTPUT ${_out_dir}
                 )
         foreach(_xsd_file ${_xsd_files})
-            STRING(REGEX REPLACE "(.*).xsd" "\\1.xml" _xml_file "${_xsd_file}")
+            #STRING(REGEX REPLACE "(.*).xsd" "\\1.mod.xml" _xml_file "${_xsd_file}")
+            set (_xml_file "${_xsd_file}.mod.xml")
             ADD_CUSTOM_COMMAND(
-                COMMAND ./configurator --doc --use ${_xsd_file} -b ${_in_dir} -t ${_out_dir}
+                #COMMAND ./configurator  -o ${_out_dir}/${_xml_file}  ${HPCC_SOURCE_DIR}/docs/BuildTools/xsd2xml.xsl ${_in_dir}/${_xsd_file}
+                COMMAND ${SAXON_EXECUTABLE}   -o:${_out_dir}/${_xml_file}  -xsl:${HPCC_SOURCE_DIR}/docs/BuildTools/xsdattr2htmltable.xsl2 -s:${_in_dir}/${_xsd_file}
                 OUTPUT ${_out_dir}/${_xml_file}
-                WORKING_DIRECTORY ${CONFIGURATOR_DIRECTORY}
+                WORKING_DIRECTORY ${_out_dir}
                 DEPENDS ${_out_dir} ${_in_dir}/${_xsd_file} ${_in_dir}/environment.xsd
                 )
             list(APPEND _xml_files ${_out_dir}/${_xml_file})

docs/BuildTools/xsdattr2htmltable.xsl2

@@ -0,0 +1,161 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="2.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:hpcc="https://www.hpccsystems.com"
+  exclude-result-prefixes="xs"
+  >
+  <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
+
+  <xsl:variable name="title" select="xs:schema/xs:element[1]/@name"/>
+  <xsl:template match="/xs:schema">
+    <xsl:text disable-output-escaping="yes">&lt;!DOCTYPE sect1 PUBLIC &quot;-//OASIS//DTD DocBook XML V4.5//EN&quot;
+&quot;http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd&quot;&gt; </xsl:text>
+    <sect2>
+      <xsl:attribute name="id"><xsl:value-of select="$title"/>_mod</xsl:attribute>
+      <title><xsl:value-of select="$title"/></title>
+      <xsl:apply-templates select = "//xs:element"/>
+      <xsl:apply-templates select = "//xs:complexType"/>
+      <xsl:apply-templates select = "//xs:attributeGroup"/>
+    </sect2>
+  </xsl:template>
+
+
+  <xsl:function name = "hpcc:has_attributes_to_process" as = "xs:boolean">
+     <xsl:param name = "parent" />
+     <xsl:choose>
+       <xsl:when test = "count($parent/xs:attribute) gt
+          count($parent/xs:attribute/xs:annotation/xs:appinfo/viewType/'hidden')">
+          true
+        </xsl:when>
+        <xsl:otherwise>
+          false
+        </xsl:otherwise>
+     </xsl:choose>
+  </xsl:function>
+
+  <xsl:template match="xs:element">
+     <xsl:if test = "hpcc:has_attributes_to_process(.)">
+        <xsl:variable name = "index"><xsl:number level="any"/></xsl:variable>
+        <xsl:call-template name = "element-ancestors"/>
+        <para><emphasis role="bold">Attributes</emphasis></para>
+        <xsl:call-template name = "informaltable">
+          <xsl:with-param name = "undef-id" select = "$index"/>
+        </xsl:call-template>
+     </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="xs:complexType">
+     <xsl:if test = "hpcc:has_attributes_to_process(.)">
+        <xsl:variable name = "index">CT<xsl:number level="any"/></xsl:variable>
+        <xsl:call-template name = "element-ancestors"/>
+        <para><emphasis role="bold">Attributes</emphasis></para>
+        <xsl:call-template name = "informaltable">
+          <xsl:with-param name = "undef-id" select = "$index"/>
+        </xsl:call-template>
+     </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="xs:attributeGroup">
+     <xsl:if test = "hpcc:has_attributes_to_process(.)">
+        <xsl:variable name = "index">AG<xsl:number level="any"/></xsl:variable>
+        <para><emphasis role="bold"><xsl:value-of select = "@name"/></emphasis></para>
+        <para><emphasis role="bold"></emphasis></para>
+        <xsl:call-template name = "informaltable">
+          <xsl:with-param name = "undef-id" select = "$index"/>
+        </xsl:call-template>
+     </xsl:if>
+  </xsl:template>
+
+  <xsl:template name = "element-ancestors">
+    <xsl:for-each select="ancestor::*">
+       <xsl:if test = "name() = 'xs:element'">
+         <para><emphasis role="bold"> <xsl:value-of select = "@name"/></emphasis></para>
+       </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+
+  <xsl:template name = "informaltable">
+    <xsl:param name = "undef-id"/>
+
+    <informaltable>
+      <xsl:attribute name="colsep">1</xsl:attribute>
+      <xsl:attribute name="rowsep">1</xsl:attribute>
+      <xsl:choose>
+        <xsl:when test = "xs:annotation/xs:appinfo/docid">
+          <xsl:attribute name="id">
+            <xsl:value-of select="xs:annotation/xs:appinfo/docid"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="id">UNDEFINED-<xsl:value-of select="$undef-id"/></xsl:attribute>
+        </xsl:otherwise>
+      </xsl:choose>
+
+      <tgroup cols="4" align="left">
+        <colspec colwidth="155pt" /><colspec colwidth="2*" /><colspec colwidth="1*" /><colspec colwidth="0.5*" />
+        <thead>
+          <row>
+            <entry>attribute</entry>
+            <entry>values</entry>
+            <entry>default</entry>
+            <entry>required</entry>
+          </row>
+        </thead>
+        <tbody>
+          <xsl:apply-templates select="xs:attribute"/>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </xsl:template>
+
+  <xsl:template match = "xs:attribute">
+       <xsl:variable name="viewType">
+         <xsl:choose>
+           <xsl:when test="xs:annotation/xs:appinfo/viewType">
+             <xsl:value-of select="xs:annotation/xs:appinfo/viewType/text()"/>
+           </xsl:when>
+           <xsl:otherwise>visible</xsl:otherwise>
+         </xsl:choose>
+       </xsl:variable>
+
+       <xsl:variable name="tooltip">
+         <xsl:choose>
+           <xsl:when test="xs:annotation/xs:appinfo/tooltip">
+             <xsl:value-of select="xs:annotation/xs:appinfo/tooltip/text()"/>
+           </xsl:when>
+           <xsl:otherwise></xsl:otherwise>
+         </xsl:choose>
+       </xsl:variable>
+
+       <xsl:variable name="use">
+         <xsl:choose>
+           <xsl:when test="xs:annotation/xs:appinfo/required">
+             <xsl:value-of select="xs:annotation/xs:appinfo/required/text()"/>
+           </xsl:when>
+           <xsl:when test="@use">
+             <xsl:value-of select="@use"/>
+           </xsl:when>
+           <xsl:otherwise>optional</xsl:otherwise>
+         </xsl:choose>
+       </xsl:variable>
+
+       <xsl:variable name="use2">
+         <xsl:choose>
+           <xsl:when test="$use = 'true'">required</xsl:when>
+           <xsl:when test="$use = 'required'">required</xsl:when>
+           <xsl:otherwise>optional</xsl:otherwise>
+         </xsl:choose>
+       </xsl:variable>
+
+       <xsl:if test="$viewType != 'hidden'">
+         <row>
+           <entry><xsl:value-of select="@name"/></entry>
+           <entry><xsl:value-of select="$tooltip"/></entry>
+           <entry><xsl:value-of select="@default"/></entry>
+           <entry><xsl:value-of select="$use2"/></entry>
+         </row>
+       </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>

initfiles/componentfiles/configxml/DhcpServer.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
    <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/GABConfig.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/SiteCertificate.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/WsDeploy.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="EspService">

initfiles/componentfiles/configxml/WsOnDemand.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Dermot (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/custom_plugin.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/dafilesrv.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="DaFileSrvProcess">

initfiles/componentfiles/configxml/dali.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
   <xs:element name="DaliServerProcess">

initfiles/componentfiles/configxml/daliplugin.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2016 HPCC Systems®.
@@ -16,8 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
-
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="DaliServerPlugin">
         <xs:annotation>

initfiles/componentfiles/configxml/dfuplus.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="DfuplusProcess">

initfiles/componentfiles/configxml/dfuserver.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="DfuServerProcess">

initfiles/componentfiles/configxml/directories.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="utf-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/dropzone.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/eclagent_config.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:seisint="http://seisint.com" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/eclccserver.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <!--W3C Schema generated by XMLSPY v5 rel. 2 U (http://www.xmlspy.com)-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

initfiles/componentfiles/configxml/eclplus.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="EclPlusProcess">

initfiles/componentfiles/configxml/eclscheduler.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="EclSchedulerProcess">

initfiles/componentfiles/configxml/environment.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Richard (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="Environment">

initfiles/componentfiles/configxml/esp.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="EspProcess">

initfiles/componentfiles/configxml/esp_service_account.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="EspService">

initfiles/componentfiles/configxml/esp_service_wsecl.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/esp_service_wsecl2.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/espsmcservice.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Richard (Seisint, Inc.) -->
 <!--W3C Schema generated by XMLSPY v5 rel. 2 U (http://www.xmlspy.com)-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

initfiles/componentfiles/configxml/ftslave_linux.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/ftslave_linux.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/generic.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="GenericProcess">

initfiles/componentfiles/configxml/installset.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="InstallSet">

initfiles/componentfiles/configxml/ldapserver.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="LDAPServerProcess">

initfiles/componentfiles/configxml/mysqlserver.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="MySQLProcess">

initfiles/componentfiles/configxml/regress.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:seisint="http://seisint.com" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/roxie.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
   <xs:include schemaLocation="environment.xsd"/>
   <xs:element name="RoxieCluster">

initfiles/componentfiles/configxml/sasha.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="SashaServerProcess">

initfiles/componentfiles/configxml/soapplus.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="SoapplusProcess">

initfiles/componentfiles/configxml/thor.xsd.in

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rajeev Moondhra (Seisint, Inc.) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>

initfiles/componentfiles/configxml/topology.xsd

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 ################################################################################
 #    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
@@ -16,7 +17,6 @@
 ################################################################################
 -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:include schemaLocation="environment.xsd"/>
     <xs:element name="Topology">