summaryrefslogtreecommitdiff
path: root/java/demo/Database
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-09-17 14:43:01 -0230
committerMatthew Newhook <matthew@zeroc.com>2008-09-17 14:43:01 -0230
commit390294ee4254c969308e978eae6e82bba61da890 (patch)
tree79573b0dd482e96a45ac53f0833eed0dbdba8897 /java/demo/Database
parentuse InnoDB storage engine (diff)
downloadice-390294ee4254c969308e978eae6e82bba61da890.tar.bz2
ice-390294ee4254c969308e978eae6e82bba61da890.tar.xz
ice-390294ee4254c969308e978eae6e82bba61da890.zip
fix configuration.
Diffstat (limited to 'java/demo/Database')
-rw-r--r--java/demo/Database/library/Parser.java2
-rw-r--r--java/demo/Database/library/config.client12
-rw-r--r--java/demo/Database/library/config.glacier23
3 files changed, 9 insertions, 8 deletions
diff --git a/java/demo/Database/library/Parser.java b/java/demo/Database/library/Parser.java
index 772dbfde349..ad15753f240 100644
--- a/java/demo/Database/library/Parser.java
+++ b/java/demo/Database/library/Parser.java
@@ -23,7 +23,7 @@ class Parser
"help Print this message.\n" +
"exit, quit Exit this program.\n" +
"add isbn title authors Create new book.\n" +
- "isbn NUMBER Find the book that start with the given ISBN number.\n" +
+ "isbn NUMBER Find all books that start with the given ISBN number.\n" +
"authors NAME Find all books by the given authors.\n" +
"title NAME Find all books which have the given title.\n" +
"next Set the current book to the next one that was found.\n" +
diff --git a/java/demo/Database/library/config.client b/java/demo/Database/library/config.client
index 383332c2630..2ddb2ec145d 100644
--- a/java/demo/Database/library/config.client
+++ b/java/demo/Database/library/config.client
@@ -11,16 +11,16 @@ SessionFactory.Proxy=SessionFactory:default -p 10000
#Ice.Default.Router=DemoGlacier2/router:ssl -p 4064 -h 127.0.0.1
#
-# No active connection management is permitted with Glacier2.
-# Connections must remain established.
+# No active connection management is permitted because of the session
+# interfaces. Connections must remain established.
#
-#Ice.ACM.Client=0
+Ice.ACM.Client=0
#
-# Connection retry is not possible with Glacier2. Connections must
-# remain established.
+# Connection retry is not possible because of the session
+# interfaces. Connections must remain established.
#
-#Ice.RetryIntervals=-1
+Ice.RetryIntervals=-1
#
# Warn about connection exceptions
diff --git a/java/demo/Database/library/config.glacier2 b/java/demo/Database/library/config.glacier2
index 062d138f54e..40c30e3de83 100644
--- a/java/demo/Database/library/config.glacier2
+++ b/java/demo/Database/library/config.glacier2
@@ -7,7 +7,8 @@ Glacier2.InstanceName=DemoGlacier2
# The client-visible endpoint of Glacier2. This should be an endpoint
# visible from the public Internet, and it should be secure.
#
-Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
+#Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
+Glacier2.Client.Endpoints=tcp -p 4064 -h 127.0.0.1
#
# The server-visible endpoint of Glacier2. This endpoint is only