Revert "Feature #2665: Move c++ xmlrpc client from sched to oned"

This reverts commit 11b255a0f7.

SConstruct

@@ -81,7 +81,6 @@ main_env.Append(LIBPATH=[
     cwd+'/src/xml',
     cwd+'/src/document',
     cwd+'/src/zone',
-    cwd+'/src/client',
 ])
 
 # Compile flags
@@ -216,7 +215,6 @@ main_env.ParseConfig('xml2-config --libs --cflags')
 
 # SCONS scripts to build
 build_scripts=[
-    'src/client/SConstruct',
     'src/sql/SConstruct',
     'src/log/SConstruct',
     'src/common/SConstruct',

src/nebula/SConstruct

@@ -60,7 +60,6 @@ env.Prepend(LIBS=[
     'nebula_common',
     'nebula_sql',
     'nebula_log',
-    'nebula_client',
     'nebula_xml',
     'crypto',
     'xml2'

src/scheduler/SConstruct

@@ -28,6 +28,7 @@ env.Append(CPPPATH=[
 # Library dirs
 
 env.Append(LIBPATH=[
+    cwd+'/src/client',
     cwd+'/src/pool',
     cwd+'/src/sched'
 ])
@@ -37,6 +38,7 @@ env.Append(LIBPATH=[
 ################################################################################
 
 build_scripts=[
+    'src/client/SConstruct',
     'src/pool/SConstruct',
     'src/sched/SConstruct'
 ]

src/scheduler/src/client/SConstruct

@@ -16,11 +16,11 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-Import('env')
+Import('sched_env')
 
-lib_name='nebula_client'
+lib_name='scheduler_client'
 
 source_files=['Client.cc']
 
 # Build library
-env.StaticLibrary(lib_name, source_files)
+sched_env.StaticLibrary(lib_name, source_files)

src/scheduler/src/sched/SConstruct

@@ -31,7 +31,7 @@ sched_env.Prepend(LIBS=[
     'scheduler_sched',
     'scheduler_pool',
     'nebula_log',
-    'nebula_client',
+    'scheduler_client',
     'nebula_acl',
     'nebula_pool',
     'nebula_xml',