summaryrefslogtreecommitdiff
path: root/java/demo/Ice/interrupt
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-11-07 12:51:04 -0330
committerMatthew Newhook <matthew@zeroc.com>2014-11-07 12:51:04 -0330
commitf30c0c5d5a6e0ac0c9fae5f3cab48adac6318cd4 (patch)
tree98cc6dbd7790c7f10217b20b7a6f385ec6fde6c9 /java/demo/Ice/interrupt
parentICE-5837 - test failures with C++/SSL (diff)
downloadice-f30c0c5d5a6e0ac0c9fae5f3cab48adac6318cd4.tar.bz2
ice-f30c0c5d5a6e0ac0c9fae5f3cab48adac6318cd4.tar.xz
ice-f30c0c5d5a6e0ac0c9fae5f3cab48adac6318cd4.zip
- Renamed gradle projects to camel case which enables task abbreviation.
- Demo builds now produce a runnable jar. - Fixes to expect.py and READMEs for this change.
Diffstat (limited to 'java/demo/Ice/interrupt')
-rw-r--r--java/demo/Ice/interrupt/README4
-rwxr-xr-xjava/demo/Ice/interrupt/expect.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/java/demo/Ice/interrupt/README b/java/demo/Ice/interrupt/README
index 1e9c183090f..bdc4015713f 100644
--- a/java/demo/Ice/interrupt/README
+++ b/java/demo/Ice/interrupt/README
@@ -4,11 +4,11 @@ using Thread.interrupt().
To run the demo, first start the server:
-$ java Server
+$ java -jar build/libs/server.jar
In a separate window, start the client:
-$ java Client
+$ java -jar build/libs/client.jar
Calling TaskManager::run on the server simulates a long running task
by sleeping 10 seconds. Ordinarily a server will not shutdown until
diff --git a/java/demo/Ice/interrupt/expect.py b/java/demo/Ice/interrupt/expect.py
index 65797c9a5ba..735ce0fdb66 100755
--- a/java/demo/Ice/interrupt/expect.py
+++ b/java/demo/Ice/interrupt/expect.py
@@ -22,9 +22,9 @@ sys.path.append(path[0])
from demoscript import Util
from demoscript.Ice import interrupt
-server = Util.spawn('java Server --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
+server = Util.spawn('java -jar build/libs/server.jar --Ice.PrintAdapterReady --Ice.Warn.Connections=0')
server.expect('.* ready')
-client = Util.spawn('java Client --Ice.Warn.Connections=0')
+client = Util.spawn('java -jar build/libs/client.jar --Ice.Warn.Connections=0')
client.expect('.*==>')
interrupt.run(client, server)