Merge branch 'candidate-6.4.2'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

clienttools/IDEPlugins/ESDL/esdl.bat.in

@@ -32,6 +32,12 @@ echo New Input file:  %newinput% >> %TMP%\log.txt
 echo New Ouput file:  %newoutput% >> %TMP%\log.txt
 copy /Y %3 %newinput%
 
+set "clienttoolsdir=@ORIG_PREFIX@\@DIR_NAME@\@version@\clienttools"
+set "clienttoolsbindir=%clienttoolsdir%\bin"
+set "clienttoolscompdir=%clienttoolsdir%\componentfiles"
+
+echo clienttoolsdir: %clienttoolsdir% >> %TMP%\log.txt
+
 :begin
 if %action%==CalcIncludes goto eof
 if %action%==SyntaxCheck goto eof
@@ -54,12 +60,13 @@ for /f "tokens=1,2,3 delims=/:" %%a in ("%8") do set http=%%a&set server=%%b&set
 echo.server: %server% >> %TMP%\log.txt
 echo.port  : %port% >> %TMP%\log.txt
 
-:publish
-esdl publish %newinput% --server %server%  --port %port% --version 1.0 --username %6 --password %9 -v 2>%5 >>%TMP%\log.txt
+echo "%clienttoolsbindir%\esdl.exe publish %newinput% %2 --server %server%  --port %port% --version 1.0 --username %6 --password %9 -v" >>%TMP%\log.txt
+"%clienttoolsbindir%"\esdl.exe publish %newinput% %2 --server %server%  --port %port% --version 1.0 --username %6 --password %9 -v 2>%5 >>%TMP%\log.txt
 goto end
 
 :genecl
-esdl ecl %newinput% %TMP% --includes --rollup -cde "@ORIG_PREFIX@\@DIR_NAME@\@version@\clienttools\componentfiles" 2>%5 >>%TMP%\log.txt
+echo "%clienttoolsbindir%"\esdl.exe ecl %newinput% %TMP% --includes --rollup -cde "%clienttoolscompdir%" 2>%5 >>%TMP%\log.txt
+"%clienttoolsbindir%"\esdl.exe ecl %newinput% %TMP% --includes --rollup -cde "%clienttoolscompdir%" 2>%5 >>%TMP%\log.txt
 goto end
 
 :end

docs/DynamicESDL/DESDL-Mods/ESDLversion.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<sect1 id="ESDL_Attributes_version">
+  <title><emphasis role="bold">version <indexterm>
+      <primary>version</primary>
+    </indexterm>and default_client_version</emphasis></title>
+
+  <para><indexterm>
+      <primary>default_client_version</primary>
+    </indexterm>The <emphasis role="bold">version</emphasis> and <emphasis
+  role="bold">default_client_version</emphasis> attributes (valid only for an
+  ESPService) allow you to specify the version to use when a version is not
+  explicitly specified in the request. </para>
+
+  <para>The <emphasis role="bold">default_client_version</emphasis> is used
+  for API requests in SOAP format if the client doesn't specify the version.
+  The <emphasis role="bold">version</emphasis> is used for requests coming
+  from a web browser without a version decoration in the URL.</para>
+
+  <para>These attributes provide better API backward compatibility while
+  allowing API developers to see the latest interface using a browser. </para>
+
+  <para>If <emphasis role="bold">default_client_version</emphasis> is higher
+  than <emphasis role="bold">version</emphasis>, the service uses <emphasis
+  role="bold">default_client_version</emphasis> for all requests that don't
+  specify a <emphasis role="bold">version</emphasis>.</para>
+
+  <para>Even though defaults can be specified for a service, you should still
+  encourage API developers to specify a version in requests to ensure
+  compatibility between their application and the service. </para>
+
+  <para><emphasis role="bold">Example:</emphasis></para>
+
+  <programlisting> ESPservice [version("0.02"), default_client_version("0.01")] EsdlExample
+{
+    ESPmethod EchoPersonInfo(EchoPersonInfoRequest, EchoPersonInfoResponse);
+    ESPmethod RoxieEchoPersonInfo(RoxieEchoPersonInfoRequest, RoxieEchoPersonInfoResponse);
+};</programlisting>
+</sect1>

docs/DynamicESDL/ESDL_LangRef_Includer.xml

@@ -245,7 +245,9 @@
     <xi:include href="DynamicESDL/DESDL-Mods/ESDLdescription.xml"
                 xpointer="element(/1)"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+    <xi:include href="DynamicESDL/DESDL-Mods/ESDLversion.xml"
+                xpointer="element(/1)"
+                xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="DynamicESDL/DESDL-Mods/ESDLauth_feature.xml"
                 xpointer="element(/1)"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />

docs/ECLWatch/TheECLWatchMan.xml

@@ -1500,9 +1500,6 @@
       role="bold">Dynamic ESDL</emphasis> from the navigation sub-menu
       bar.</para>
 
-      <para>The DESDL-based ESP services available are listed in the navigator
-      pane on the left as children of their parent ESP process.</para>
-
       <figure>
         <title>Dynamic ESDL sub-menu</title>
 
@@ -1513,11 +1510,21 @@
         </mediaobject>
       </figure>
 
-      <para>This tab contains a list of all DESDL based ESP Services and their
-      ESDL Binding information.. For more information about Dynamic ESDL refer
-      to the documentation; <emphasis>Dynamic ESDL</emphasis> available from
-      the HPCC Systems portal: <ulink
-      url="https://hpccsystems.com/download/documentation/learning-ecl/dynamic-esdl">https://hpccsystems.com/download/documentation/learning-ecl/dynamic-esdl</ulink></para>
+      <para>The <emphasis role="bold">Dynamic ESDL</emphasis> tab contains a
+      list of all DESDL based ESP Services and their ESDL Binding information.
+      The DESDL-based ESP services available are listed in the navigator pane
+      on the left as children of their parent ESP process.</para>
+
+      <para>The <emphasis role="bold">Definitions</emphasis> tab, also
+      accessible from the <emphasis role="bold">Dynamic ESDL</emphasis>
+      button's sub-menu, lists all available ESDL definitions and provides a
+      view into any of the definitions. These definitions are used to
+      dynamically define interfaces for existing ESP web services.</para>
+
+      <para>For more information about Dynamic ESDL refer to the
+      documentation; <emphasis>Dynamic ESDL</emphasis> available from the HPCC
+      Systems portal: <ulink
+      url="https://hpccsystems.com/training/documentation/learning-ecl/">https://hpccsystems.com/training/documentation/learning-ecl/dynamic-esdl</ulink></para>
 
       <sect2 id="USING_Dynamic_ESDL">
         <title>Using Dynamic ESDL</title>

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -4233,7 +4233,7 @@ StringBuffer &sharedObjectFileName(StringBuffer &filename, const char *name, con
 {
     filename.append((name && *name) ? name : "workunit");
     if (copy)
-        filename.append('-').append(copy);
+        filename.append('_').append(copy);
     if (notEmpty(ext))
         filename.append(ext);
     return filename;

roxie/ccd/ccdqueue.cpp

@@ -2846,7 +2846,7 @@ public:
                 if (!pingsReceived && roxieMulticastEnabled)
                     DBGLOG("PING: NO replies received! Please check multicast settings, and that your network supports multicast.");
                 else if (traceLevel)
-                    DBGLOG("PING: %d replies received, average delay %d", pingsReceived, pingsReceived ? pingsElapsed / pingsReceived : 0);
+                    DBGLOG("PING: %d replies received, average delay %uus", pingsReceived, pingsReceived ? pingsElapsed / pingsReceived : 0);
                 pingsReceived = 0;
                 pingsElapsed = 0;
                 sendPing(ROXIE_HIGH_PRIORITY);  // MORE - we could think about alternating the priority or sending pings on high and low at the same time...