summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/src/IceInternal/PropertyNames.java50
-rw-r--r--java/test/Glacier2/attack/AttackClient.java10
-rwxr-xr-xjava/test/Glacier2/attack/run.py3
-rw-r--r--java/test/Glacier2/router/CallbackClient.java20
-rwxr-xr-xjava/test/Glacier2/router/run.py3
5 files changed, 44 insertions, 42 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 5ffc548fa1a..0786a86d5a0 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -330,19 +330,19 @@ public final class PropertyNames
new Property("IcePatch2\\.ThreadPool\\.SizeMax", false, null),
new Property("IcePatch2\\.ThreadPool\\.SizeWarn", false, null),
new Property("IcePatch2\\.ThreadPool\\.StackSize", false, null),
- new Property("IcePatch2\\.Admin\\.AdapterId", false, null),
- new Property("IcePatch2\\.Admin\\.Endpoints", false, null),
- new Property("IcePatch2\\.Admin\\.Locator", false, null),
- new Property("IcePatch2\\.Admin\\.PublishedEndpoints", false, null),
+ new Property("IcePatch2\\.Admin\\.AdapterId", true, null),
+ new Property("IcePatch2\\.Admin\\.Endpoints", true, null),
+ new Property("IcePatch2\\.Admin\\.Locator", true, null),
+ new Property("IcePatch2\\.Admin\\.PublishedEndpoints", true, null),
new Property("IcePatch2\\.Admin\\.RegisterProcess", true, null),
- new Property("IcePatch2\\.Admin\\.ReplicaGroupId", false, null),
- new Property("IcePatch2\\.Admin\\.Router", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPerConnection", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPool\\.Size", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeMax", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
- new Property("IcePatch2\\.Admin\\.ThreadPool\\.StackSize", false, null),
+ new Property("IcePatch2\\.Admin\\.ReplicaGroupId", true, null),
+ new Property("IcePatch2\\.Admin\\.Router", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPerConnection", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPerConnection\\.StackSize", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPool\\.Size", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
+ new Property("IcePatch2\\.Admin\\.ThreadPool\\.StackSize", true, null),
new Property("IcePatch2\\.ChunkSize", false, null),
new Property("IcePatch2\\.Directory", false, null),
new Property("IcePatch2\\.InstanceName", false, null),
@@ -450,19 +450,19 @@ public final class PropertyNames
{
new Property("Glacier2\\.AddSSLContext", false, null),
new Property("Glacier2\\.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
- new Property("Glacier2\\.Admin\\.AdapterId", false, null),
- new Property("Glacier2\\.Admin\\.Endpoints", false, null),
- new Property("Glacier2\\.Admin\\.Locator", false, null),
- new Property("Glacier2\\.Admin\\.PublishedEndpoints", false, null),
+ new Property("Glacier2\\.Admin\\.AdapterId", true, null),
+ new Property("Glacier2\\.Admin\\.Endpoints", true, null),
+ new Property("Glacier2\\.Admin\\.Locator", true, null),
+ new Property("Glacier2\\.Admin\\.PublishedEndpoints", true, null),
new Property("Glacier2\\.Admin\\.RegisterProcess", true, null),
- new Property("Glacier2\\.Admin\\.ReplicaGroupId", false, null),
- new Property("Glacier2\\.Admin\\.Router", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPerConnection", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
- new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", false, null),
+ new Property("Glacier2\\.Admin\\.ReplicaGroupId", true, null),
+ new Property("Glacier2\\.Admin\\.Router", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPerConnection", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPerConnection\\.StackSize", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
+ new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", true, null),
new Property("Glacier2\\.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
new Property("Glacier2\\.Client\\.AdapterId", false, null),
new Property("Glacier2\\.Client\\.Endpoints", false, null),
diff --git a/java/test/Glacier2/attack/AttackClient.java b/java/test/Glacier2/attack/AttackClient.java
index 48208139d13..b8a3696c95a 100644
--- a/java/test/Glacier2/attack/AttackClient.java
+++ b/java/test/Glacier2/attack/AttackClient.java
@@ -109,13 +109,13 @@ class AttackClient extends Ice.Application
System.out.flush();
backend.shutdown();
communicator().setDefaultRouter(null);
- Ice.ObjectPrx adminBase = communicator().stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
- Glacier2.AdminPrx admin = Glacier2.AdminPrxHelper.checkedCast(adminBase);
- test(admin != null);
- admin.shutdown();
+ Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
+ test(process != null);
+ process.shutdown();
try
{
- admin.ice_ping();
+ process.ice_ping();
test(false);
}
catch(Ice.LocalException ex)
diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py
index ff955c2cfd4..c5bb9ee37d8 100755
--- a/java/test/Glacier2/attack/run.py
+++ b/java/test/Glacier2/attack/run.py
@@ -32,7 +32,8 @@ command = router + TestUtil.cppClientServerOptions + \
r' --Ice.PrintProcessId' \
r' --Glacier2.RoutingTable.MaxSize=10' + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"'
print "starting router...",
diff --git a/java/test/Glacier2/router/CallbackClient.java b/java/test/Glacier2/router/CallbackClient.java
index c6ab1ca364f..96713a2740a 100644
--- a/java/test/Glacier2/router/CallbackClient.java
+++ b/java/test/Glacier2/router/CallbackClient.java
@@ -398,36 +398,36 @@ class CallbackClient extends Ice.Application
System.out.println("ok");
}
- Ice.ObjectPrx adminBase;
+ Ice.ObjectPrx processBase;
{
- System.out.print("testing stringToProxy for admin object... ");
- adminBase = communicator().stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
+ System.out.print("testing stringToProxy for process object... ");
+ processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
System.out.println("ok");
}
/*
{
- System.out.print("uninstalling router with admin object... ");
- adminBase.ice_router(null);
+ System.out.print("uninstalling router with process object... ");
+ processBase.ice_router(null);
System.out.println("ok");
}
*/
- Glacier2.AdminPrx admin;
+ Ice.ProcessPrx process;
{
System.out.print("testing checked cast for admin object... ");
- admin = Glacier2.AdminPrxHelper.checkedCast(adminBase);
- test(admin != null);
+ process = Ice.ProcessPrxHelper.checkedCast(processBase);
+ test(process != null);
System.out.println("ok");
}
System.out.print("testing Glacier2 shutdown... ");
- admin.shutdown();
+ process.shutdown();
try
{
- admin.ice_ping();
+ process.ice_ping();
test(false);
}
catch(Ice.LocalException ex)
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index 14eea5b1cce..49c67e2f46f 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -36,7 +36,8 @@ command = router + TestUtil.cppClientServerOptions + \
r' --Glacier2.SessionTimeout="30"' + \
r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
- r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+ r' --Ice.Admin.InstanceName=Glacier2' + \
r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"'
print "starting router...",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 03:03:34 +0000