ICE-5998 - Java IceBox demo need to configure CLASSPATH

2 files changed, 16 insertions, 0 deletions

diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py
index cb94aa7ae16..c3e593cbff9 100755
--- a/demoscript/IceGrid/icebox.py
+++ b/demoscript/IceGrid/icebox.py
@@ -33,6 +33,12 @@ def run(clientStr, desc = 'application'):
 
     sys.stdout.write("starting icegridnode... ")
     sys.stdout.flush()
+    
+    if "CLASSPATH" in os.environ:
+        os.environ["CLASSPATH"] = "%s%s%s" % (Util.getIceBoxClassPath(), os.pathsep, os.environ.get("CLASSPATH", ""))
+    else:
+        os.environ["CLASSPATH"] = Util.getIceBoxClassPath()
+    
     node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
     node.expect('IceGrid.Registry.Internal ready')
     node.expect('IceGrid.Registry.Server ready')
diff --git a/demoscript/Util.py b/demoscript/Util.py
index baec3157398..8a2a63b57f9 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -802,6 +802,16 @@ def addLdPath(libpath):
     else:
         addenv("LD_LIBRARY_PATH", libpath)
 
+def getIceBoxClassPath():
+    jarSuffix = "-" + getIceVersion() + ".jar"
+    javaDir = getIceDir("java")
+    s = ""
+    for jar in ["ice", "icebox"]:
+        if s != "":
+            s += os.pathsep
+        s += os.path.join(javaDir, "lib", jar + jarSuffix)
+    return s
+
 def processCmdLine():
     def usage():
         print("usage: " + sys.argv[0] + " --x64 --x86 --preferIPv4 --env --noenv --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir> --service-dir=<dir>", "--c++11")