Merge branch 'develop'

java/aapp/jopg/src/GrowFrame.java

@@ -68,7 +68,7 @@ public class GrowFrame implements GraphApplIfc {
 
     public int command(String cmd) {
 	if ( appl != null)
-	    return appl.command(cmd);
+	    return appl.command(cmd, this);
 	return 0;
     }
 

remote/exe/rs_remotehandler/src/rs_remotehandler.c

@@ -194,7 +194,7 @@ static void AddTransports()
   {
     sts = gdh_ObjidToPointer(objid, &objref);
     sprintf(tp[tpcount].path, "rs_remote_qcom"); 
-    tp[tpcount].id = ((pwr_sClass_RemnodeQCom *) objref)->MyQueue;
+    tp[tpcount].id = ((pwr_sClass_RemnodeQCom *) objref)->ReceiveQueue;
     tp[tpcount].disable = &((pwr_sClass_RemnodeQCom *) objref)->Disable;
     tp[tpcount].restart_limit = &((pwr_sClass_RemnodeQCom *) objref)->RestartLimit;
     tp[tpcount].restarts = &((pwr_sClass_RemnodeQCom *) objref)->RestartCount;

src/doc/web/en_us/doc_menu.html

@@ -48,7 +48,7 @@
     </table>
     <h2 id="mainmenu">Upgrading</h2>
     <table id="mainmenu" border="1" cellspacing="0" width="100%">
-    <tr><td id="mainmenu"><a id="mainmenu" href="upgrade53.pdf" target="right">Upgrading from V5.2</a></td></tr>
+    <tr><td id="mainmenu"><a id="mainmenu" href="upgrade54.pdf" target="right">Upgrading from V5.3</a></td></tr>
     </table>
     <br>
     <h2 id="mainmenu">Changelog</h2>

src/doc/web/sv_se/doc_menu.html

@@ -55,7 +55,7 @@
     </table>
     <h2 id="mainmenu">Uppgradering</h2>
     <table id="mainmenu" border="1" cellspacing="0" width="100%">
-   <tr><td id="mainmenu"><a id="mainmenu" href="../en_us/upgrade53.pdf" target="right">Uppgradering frn V5.2</a></td></tr>
+   <tr><td id="mainmenu"><a id="mainmenu" href="../en_us/upgrade54.pdf" target="right">Uppgradering frn V5.3</a></td></tr>
     </table>
     <br>
     <h2 id="mainmenu">ndringslogg</h2>

src/lib/co/src/co_ccm.c

@@ -611,7 +611,7 @@ int ccm_varname_parse(
 	    }
 	    sscanf( elementstr, "%d", element);
 	    *s = '\0';
-	    if ( (*element < 0) || (*element > 1000) )
+	    if ( (*element < 0) || (*element > 5000) )
 	    {
 	      return 0;
 	    }

wb/lib/wb/src/wb_lfu.cpp

@@ -1765,7 +1765,9 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	  MsgWindow::message( 'E', msg, msgw_ePop_Default);
 	  syntax_error = 1;
 	}
-	if ( strcmp( nodevect[i].address, nodevect[j].address) == 0) {
+       if ( strcmp( nodevect[i].address, "0.0.0.0") != 0 &&
+            strcmp( nodevect[i].address, "127.0.0.1") != 0 &&
+            strcmp( nodevect[i].address, nodevect[j].address) == 0) {
 	  char msg[200];
 	  pwr_tOName oname1, oname2;
 	  sts = ldh_ObjidToName( ldhses, nodevect[i].oid, ldh_eName_Hierarchy, 
@@ -2371,7 +2373,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 			 nodename_ptr, nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_ApplFile)
 		fprintf( file, "appl %s W "pwr_cNameAppl" $pwrp_load/\n",
-			 nodename_ptr, "$pwrp_cnf/", nodename_ptr, *bus_number_ptr);
+			 nodename_ptr, "$pwrp_load/", nodename_ptr, *bus_number_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_PwrpAliasFile)
 		fprintf( file, "appl %s W $pwrp_load/pwrp_alias.dat $pwrp_load/pwrp_alias.dat\n", 
 			 nodename_ptr);
@@ -2382,7 +2384,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	      if ( *components_ptr & pwr_mDistrComponentMask_XMLFiles)
 		fprintf( file, "appl %s W $pwrp_load/*.xml\n", nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttHelpFile) {
-		fprintf( file, "appl %s W $pwrp_cnf/%s/xtt_help.dat:$pwrp_cnf/xtt_help.dat $pwrp_load/xtt_help.dat\n", 
+		fprintf( file, "appl %s W $pwrp_load/%s/xtt_help.dat:$pwrp_load/xtt_help.dat $pwrp_load/xtt_help.dat\n", 
 			 nodename_ptr, nodename_ptr);
 	      }
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttResourceFile) {