- Moved cpp/slice to slice

- Merged all TestUtil.py modules to config/TestUtil.py
- Moved all certs to config/certs
- Updated test scripts to refer to new TestUtil.py module and use new
  interfaces
- Updated build systems to refer to new slice location
- Moved cpp/install to distribution
- Moved and merged all IceGridAdmin.py modules to config.
- Modified build system to deal with new build logic. That is there are
  3 basic ways to find the slice translators and runtime: ICE_HOME, an
  RPM install and the source distribution. Automatically detecting Ice
  in a default install location is now problematic and no longer done.

1 files changed, 0 insertions, 274 deletions

diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py
deleted file mode 100644
index b4b47cc4bcb..00000000000
--- a/java/config/IceGridAdmin.py
+++ /dev/null
@@ -1,274 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import sys, os, TestUtil
-from threading import Thread
-
-debug = 0
-#debug = 1
-
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
-    toplevel = os.path.normpath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
-        break
-else:
-    raise "can't find toplevel directory!"
-
-if not os.environ.has_key('ICE_HOME'):
-    print "ICE_HOME is not defined."
-    sys.exit(0)
-
-ice_home = os.environ['ICE_HOME']
-
-iceGridPort = "12010";
-
-nodeOptions = r' --Ice.Warn.Connections=0' + \
-              r' --IceGrid.Node.Endpoints=default' + \
-              r' --IceGrid.Node.WaitTime=30' + \
-              r' --Ice.ProgramName=icegridnode' + \
-              r' --IceGrid.Node.Trace.Replica=0' + \
-              r' --IceGrid.Node.Trace.Activator=0' + \
-              r' --IceGrid.Node.Trace.Adapter=0' + \
-              r' --IceGrid.Node.Trace.Server=0' + \
-              r' --IceGrid.Node.PrintServersReady=node' + \
-              r' --Ice.NullHandleAbort' + \
-              r' --Ice.ThreadPool.Server.Size=0';
-
-registryOptions = r' --Ice.Warn.Connections=0' + \
-                  r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \
-                  r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \
-                  r' --IceGrid.Registry.Server.Endpoints=default' + \
-                  r' --IceGrid.Registry.Internal.Endpoints=default' + \
-                  r' --IceGrid.Registry.SessionManager.Endpoints=default' + \
-                  r' --IceGrid.Registry.Trace.Session=0' + \
-                  r' --IceGrid.Registry.Trace.Application=0' + \
-                  r' --IceGrid.Registry.Trace.Adapter=0' + \
-                  r' --IceGrid.Registry.Trace.Object=0' + \
-                  r' --IceGrid.Registry.Trace.Server=0' + \
-                  r' --IceGrid.Registry.Trace.Locator=0' + \
-                  r' --Ice.ThreadPool.Server.Size=0';
-
-def startIceGridRegistry(testdir, dynamicRegistration = False):
-
-    global iceGridPort
-
-    iceGrid = os.path.join(ice_home, "bin", "icegridregistry")
-
-    dataDir = os.path.join(testdir, "db", "registry")
-    if not os.path.exists(dataDir):
-        os.mkdir(dataDir)
-    else:
-        cleanDbDir(dataDir)
-
-    print "starting icegrid registry...",
-    command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + registryOptions + \
-              r' --IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \
-              r' --IceGrid.Registry.Data=' + dataDir + \
-              r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(ice_home, "config", "templates.xml")
-
-    if dynamicRegistration:
-        command += ' --IceGrid.Registry.DynamicRegistration'        
-
-    if TestUtil.debug:
-        print "(" + command + ")"
-
-    iceGridPipe = os.popen(command + " 2>&1")
-    TestUtil.getServerPid(iceGridPipe)
-    TestUtil.getAdapterReady(iceGridPipe, True, 4)
-    print "ok"
-
-    return iceGridPipe
-
-def startIceGridNode(testdir):
-
-    iceGrid = os.path.join(ice_home, "bin", "icegridnode")
-
-    dataDir = os.path.join(testdir, "db", "node")
-    if not os.path.exists(dataDir):
-        os.mkdir(dataDir)
-    else:
-        cleanDbDir(dataDir)
-
-    overrideOptions = '"' 
-    for opt in TestUtil.clientServerOptions.split():
-        opt = opt.replace("--", "")
-        if opt.find("=") == -1:
-            opt += "=1"
-        overrideOptions += opt + " "
-    overrideOptions += ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"'
-
-    print "starting icegrid node...",
-    command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + nodeOptions + \
-              r' "--Ice.Default.Locator=IceGrid/Locator:default -p ' + iceGridPort + '" ' + \
-              r' --IceGrid.Node.Data=' + dataDir + \
-              r' --IceGrid.Node.Name=localnode' + \
-              r' --IceGrid.Node.PropertiesOverride=' + overrideOptions
-
-    if TestUtil.debug:
-        print "(" + command +")",
-
-    iceGridPipe = os.popen(command + " 2>&1")
-    TestUtil.getServerPid(iceGridPipe)
-    TestUtil.getAdapterReady(iceGridPipe, False)
-    TestUtil.waitServiceReady(iceGridPipe, 'node')
-        
-    print "ok"
-
-    return iceGridPipe
-
-def iceGridAdmin(cmd, ignoreFailure = False):
-
-    global iceGridPort
-    iceGridAdmin = os.path.join(ice_home, "bin", "icegridadmin")
-
-    user = r"admin1"
-    if cmd == "registry shutdown":
-        user = r"shutdown"
-    command = iceGridAdmin + TestUtil.cppClientOptions + \
-              r' --Ice.Default.Locator="IceGrid/Locator:default -p ' + iceGridPort + '" ' + \
-              r" --IceGridAdmin.Username=" + user + " --IceGridAdmin.Password=test1 " + \
-              r' -e "' + cmd + '"'
-
-    if TestUtil.debug:
-        print "(" + command + ")",
-
-    iceGridAdminPipe = os.popen(command + " 2>&1")
-
-    output = iceGridAdminPipe.readlines()
-        
-    iceGridAdminStatus = TestUtil.closePipe(iceGridAdminPipe)
-    if not ignoreFailure and iceGridAdminStatus:
-        print "icegridadmin command failed: " + cmd
-        for line in output:
-            print line
-        TestUtil.killServers()
-        sys.exit(1)
-
-    return output
-
-def killNodeServers():
-    
-    global iceGridPort
-    
-    for server in iceGridAdmin("server list"):
-        server = server.strip()
-        iceGridAdmin("server disable " + server, True)
-        iceGridAdmin("server signal " + server + " SIGKILL", True)
-
-def iceGridTest(name, application, additionalOptions = "", applicationOptions = ""):
-
-    testdir = os.path.join(toplevel, "test", name)
-    client = TestUtil.javaCmd + " -ea Client --Ice.ProgramName=Client "
-
-    clientOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p " + iceGridPort + "\" " + additionalOptions
-
-    iceGridRegistryPipe = startIceGridRegistry(testdir)
-    iceGridNodePipe = startIceGridNode(testdir)
-
-    if application != "":
-        print "adding application...",
-        iceGridAdmin('application add ' + os.path.join(testdir, application) + ' ' + \
-                     '"test.dir=' + testdir + '" "ice.dir=' + toplevel + '" ' + applicationOptions)
-        print "ok"
-
-    print "starting client...",
-    command = client + TestUtil.clientOptions + " " + clientOptions
-    if TestUtil.debug:
-        print "(" + command +")",
-    clientPipe = os.popen(command + " 2>&1")
-    print "ok"
-
-    TestUtil.printOutputFromPipe(clientPipe)
-    
-    clientStatus = TestUtil.closePipe(clientPipe)
-    if clientStatus:
-        killNodeServers()
-        if application != "":
-            print "remove application...",
-            iceGridAdmin("application remove Test", True)
-            print "ok"
-        TestUtil.killServers()
-        sys.exit(1)
-
-    if application != "":
-        print "remove application...",
-        iceGridAdmin("application remove Test")
-        print "ok"
-
-    print "shutting down icegrid node... ",
-    iceGridAdmin("node shutdown localnode")
-    print "ok"
-
-    print "shutting down icegrid registry... ",
-    iceGridAdmin("registry shutdown")
-    print "ok"
-
-    TestUtil.joinServers()
-
-    if TestUtil.serverStatus():
-        sys.exit(1)                
-
-def iceGridClientServerTest(name, additionalClientOptions, additionalServerOptions):
-
-    testdir = os.path.join(toplevel, "test", name)
-    server = TestUtil.javaCmd + " -ea Server --Ice.ProgramName=Server "
-    client = TestUtil.javaCmd + " -ea Client --Ice.ProgramName=Client "
-
-    clientOptions = "--Ice.Default.Locator=\"IceGrid/Locator:default -p " + iceGridPort + "\" " + \
-                    additionalClientOptions
-
-    serverOptions = "--Ice.Default.Locator=\"IceGrid/Locator:default -p " + iceGridPort + "\" " + \
-                    additionalServerOptions
-    
-    iceGridRegistryPipe = startIceGridRegistry(testdir, True)
-
-    print "starting server...",
-    command = server + TestUtil.clientServerOptions + " " + serverOptions
-    if TestUtil.debug:
-        print "(" + command +")",
-    serverPipe = os.popen(command + " 2>&1")
-    TestUtil.getAdapterReady(serverPipe)
-    print "ok"
-
-    print "starting client...",
-    command = client + TestUtil.clientOptions + " " + clientOptions
-    if TestUtil.debug:
-        print "(" + command +")",
-    clientPipe = os.popen(command + " 2>&1")
-    print "ok"
-
-    TestUtil.printOutputFromPipe(clientPipe)
-    
-    clientStatus = TestUtil.closePipe(clientPipe)
-    if clientStatus:
-        TestUtil.killServers()
-        sys.exit(1)
-
-    print "shutting down icegrid registry... ",
-    iceGridAdmin("registry shutdown")
-    print "ok"
-
-    TestUtil.joinServers()
-
-    if TestUtil.serverStatus():
-        sys.exit(1)
-
-def cleanDbDir(path):
-    for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore"]:
-        if os.path.isdir(filename):
-            cleanDbDir(filename)
-            try:
-                os.rmdir(filename)
-            except OSError:
-                # This might fail if the directory is empty (because
-                # it itself contains a .gitignore file.
-                pass
-        else:
-            os.remove(filename)