[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core Umakefil, 1.22, 1.22.12.1 core_proc.cpp,
From:       dcollins () helixcommunity ! org
Date:       2007-04-30 17:14:21
Message-ID: 200704301714.l3UHEVsh030249 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/engine/core
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv22434/engine/core

Modified Files:
      Tag: SERVER_BORABORA
	Umakefil core_proc.cpp proc_container.cpp 
Log Message:
updates related to the SERVER_BORABORA branch, migrating code from
server_rn to server-restricted, server, etc. 
Distlic is a long-since obsoleted feature, and related code
was causing migration complexities, so it was just removed.


Index: Umakefil
===================================================================
RCS file: /cvsroot/server/engine/core/Umakefil,v
retrieving revision 1.22
retrieving revision 1.22.12.1
diff -u -d -r1.22 -r1.22.12.1
--- Umakefil	5 Aug 2005 01:09:26 -0000	1.22
+++ Umakefil	30 Apr 2007 17:14:19 -0000	1.22.12.1
@@ -112,7 +112,6 @@
 	, "clientregtree.cpp"
 	, "core_proc.cpp"
 	, "dispatchq.cpp"
-	, "dist_lic_requester.cpp"
 	, "iids.cpp"
 	, "loadinfo.cpp"
 	, "malloc.cpp"

Index: proc_container.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/proc_container.cpp,v
retrieving revision 1.31
retrieving revision 1.31.6.1
diff -u -d -r1.31 -r1.31.6.1
--- proc_container.cpp	3 Oct 2006 23:19:06 -0000	1.31
+++ proc_container.cpp	30 Apr 2007 17:14:19 -0000	1.31.6.1
@@ -67,7 +67,6 @@
 #include "bcastmgr.h"
 #include "altserverproxycfg.h"
 #include "altserverproxy.h"
-#include "dist_lic_requester.h"
 #include "server_prefs.h"
 #include "mutexlist.h"
 #include "hxqossig.h"
@@ -132,7 +131,6 @@
     global_server_control   = 0;
     data_convert_con        = 0;
     alt_server_proxy_cfg_mgr = 0;
-    license_requester       = 0;
     client_stats_manager    = NULL;
     qos_prof_select         = 0;
     qos_bus_ctl             = 0;
@@ -229,7 +227,6 @@
     global_server_control   = pc->global_server_control;
     data_convert_con        = pc->data_convert_con;
     alt_server_proxy_cfg_mgr = pc->alt_server_proxy_cfg_mgr;
-    license_requester       = pc->license_requester;
     client_stats_manager    = pc->client_stats_manager;
     rtspstats_manager       = pc->rtspstats_manager;
     sdpstats_manager        = pc->sdpstats_manager;

Index: core_proc.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/core_proc.cpp,v
retrieving revision 1.61
retrieving revision 1.61.6.1
diff -u -d -r1.61 -r1.61.6.1
--- core_proc.cpp	5 Mar 2007 23:24:05 -0000	1.61
+++ core_proc.cpp	30 Apr 2007 17:14:19 -0000	1.61.6.1
@@ -136,7 +136,6 @@
 #include "sapclass.h"       // CSapManager
 #include "server_control.h" // GlobalServerControl
 #include "hxdtcvt.h"        // IHXDataConvert
-#include "dist_lic_requester.h"
 #include "dtcvtcon.h"       // DataConvertController
 #include "altserverproxycfg.h"      // AltServerProxyConfigHandler
 
@@ -601,7 +600,6 @@
 CoreProcessInitCallback::func(Process* proc)
 {
     Config*         config   = NULL;
-    DistributedLicenseRequester* license_requester = NULL;
     ServerRegistry* registry = NULL;
     int backlog = 0;
     int setegid_err = 0;
@@ -664,7 +662,6 @@
         proc->pc->client_stats_manager->SetUseRegistryForStats(nUseRegistryForStats ? TRUE : FALSE);
     }
 
-    proc->pc->license_requester = new DistributedLicenseRequester;
 
 
     /*


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]