summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcpp/config/PropertyNames.xml4
-rw-r--r--cpp/demo/IceBox/hello/README2
-rw-r--r--cpp/demo/IceBox/hello/config.admin14
-rw-r--r--cpp/demo/IceBox/hello/config.icebox37
-rw-r--r--cpp/src/Ice/PropertyNames.cpp22
-rw-r--r--cpp/src/Ice/PropertyNames.h3
-rw-r--r--cpp/src/IceBox/Admin.cpp56
-rwxr-xr-xcpp/test/IceStorm/federation/run.py15
-rwxr-xr-xcs/demo/IceBox/hello/config.admin13
-rw-r--r--cs/demo/IceBox/hello/config.icebox40
-rw-r--r--cs/src/Ice/PropertyNames.cs19
-rwxr-xr-xdemoscript/IceBox/hello.py2
-rw-r--r--java/demo/IceBox/hello/README2
-rw-r--r--java/demo/IceBox/hello/config.admin14
-rw-r--r--java/demo/IceBox/hello/config.icebox28
-rw-r--r--java/src/IceBox/Admin.java58
-rw-r--r--java/src/IceInternal/PropertyNames.java19
17 files changed, 257 insertions, 91 deletions
diff --git a/cpp/config/PropertyNames.xml b/cpp/config/PropertyNames.xml
index 04763e2cda7..b0e7d943ac4 100755
--- a/cpp/config/PropertyNames.xml
+++ b/cpp/config/PropertyNames.xml
@@ -375,6 +375,10 @@ generated from the section label.
<property name="InheritProperties" />
</section>
+ <section name="IceBoxAdmin">
+ <property name="ServiceManager.Proxy" class="proxy"/>
+ </section>
+
<section name="IceGridAdmin">
<property name="AuthenticateUsingSSL" />
<property name="Username" />
diff --git a/cpp/demo/IceBox/hello/README b/cpp/demo/IceBox/hello/README
index 10561cdf56a..649e76814a8 100644
--- a/cpp/demo/IceBox/hello/README
+++ b/cpp/demo/IceBox/hello/README
@@ -15,7 +15,7 @@ $ client
To shut down IceBox, use iceboxadmin:
-$ iceboxadmin --Ice.Config=config.icebox shutdown
+$ iceboxadmin --Ice.Config=config.admin shutdown
Unix Note:
diff --git a/cpp/demo/IceBox/hello/config.admin b/cpp/demo/IceBox/hello/config.admin
new file mode 100644
index 00000000000..4e148e8a316
--- /dev/null
+++ b/cpp/demo/IceBox/hello/config.admin
@@ -0,0 +1,14 @@
+#
+# Proxy to the IceBox ServiceManager:
+#
+
+#
+# When the IceBox.ServiceManager object adapter is configured:
+#
+#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1
+
+#
+# When Ice.Admin is configured:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1
+
diff --git a/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox
index 65c0c31d1a0..d28f367c194 100644
--- a/cpp/demo/IceBox/hello/config.icebox
+++ b/cpp/demo/IceBox/hello/config.icebox
@@ -1,13 +1,37 @@
#
+# The IceBox ServiceManager object can be provided by configuring
+# IceBox.ServiceManager.Endpoints (and optionally
+# IceBox.InstanceName), or as a facet of the Ice.Admin object
+# (or both if you like). Make sure to keep config.admin
+# synchronized with these settings.
+#
+
+#
+# IceBox.ServiceManager configuration
+#
+
+#
# The IceBox instance name is used to set the category field of the
# IceBox ServiceManager identity.
#
-IceBox.InstanceName=DemoIceBox
+#IceBox.InstanceName=DemoIceBox
#
# The IceBox server endpoint configuration
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999
+#IceBox.ServiceManager.Endpoints=tcp -p 9998 -h 127.0.0.1
+
+
+#
+# Ice.Admin configuration
+#
+
+#
+# Enable Ice.Admin object:
+#
+Ice.Admin.InstanceName=DemoIceBox
+Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+
#
# The hello service
@@ -37,12 +61,3 @@ Ice.Warn.Connections=1
#
#Ice.Trace.Protocol=1
-#
-# SSL Configuration
-#
-Ice.Plugin.IceSSL=IceSSL:createIceSSL
-IceSSL.DefaultDir=../../../certs
-IceSSL.CertAuthFile=cacert.pem
-IceSSL.CertFile=s_rsa1024_pub.pem
-IceSSL.KeyFile=s_rsa1024_priv.pem
-#IceSSL.Trace.Security=2
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index f514fb6a11a..f4af02db377 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 19:26:30 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -150,6 +150,24 @@ const IceInternal::PropertyArray
IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData,
sizeof(IceBoxPropsData)/sizeof(IceBoxPropsData[0]));
+const IceInternal::Property IceBoxAdminPropsData[] =
+{
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.PreferSecure", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.LocatorCacheTimeout", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Locator", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Router", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimization", true, "IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized"),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ThreadPerConnection", false, 0),
+ IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy", false, 0),
+};
+
+const IceInternal::PropertyArray
+ IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
+ sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
+
const IceInternal::Property IceGridAdminPropsData[] =
{
IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
@@ -618,6 +636,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
{
IceProps,
IceBoxProps,
+ IceBoxAdminProps,
IceGridAdminProps,
IceGridProps,
IcePatch2Props,
@@ -634,6 +653,7 @@ const char* IceInternal::PropertyNames::clPropNames[] =
{
"Ice",
"IceBox",
+ "IceBoxAdmin",
"IceGridAdmin",
"IceGrid",
"IcePatch2",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index c9b88bf3f2a..e38d1d94eed 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 19:26:30 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -59,6 +59,7 @@ public:
static const PropertyArray IceProps;
static const PropertyArray IceBoxProps;
+ static const PropertyArray IceBoxAdminProps;
static const PropertyArray IceGridAdminProps;
static const PropertyArray IceGridProps;
static const PropertyArray IcePatch2Props;
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index fce10f5681d..e2f02d6a728 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -84,40 +84,52 @@ Client::run(int argc, char* argv[])
return EXIT_FAILURE;
}
- PropertiesPtr properties = communicator()->getProperties();
- Identity managerIdentity;
- managerIdentity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
- managerIdentity.name = "ServiceManager";
+
+ ObjectPrx base = communicator()->propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
- string managerProxy;
- if(properties->getProperty("Ice.Default.Locator").empty())
+ if(base == 0)
{
- string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");
- if(managerEndpoints.empty())
+ //
+ // The old deprecated way to retrieve the service manager proxy
+ //
+
+ PropertiesPtr properties = communicator()->getProperties();
+
+ Identity managerIdentity;
+ managerIdentity.category = properties->getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+ managerIdentity.name = "ServiceManager";
+
+ string managerProxy;
+ if(properties->getProperty("Ice.Default.Locator").empty())
{
- cerr << appName() << ": property `IceBox.ServiceManager.Endpoints' is not set" << endl;
- return EXIT_FAILURE;
+ string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints");
+ if(managerEndpoints.empty())
+ {
+ cerr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
+ return EXIT_FAILURE;
+ }
+
+ managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" :" + managerEndpoints;
}
-
- managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" :" + managerEndpoints;
- }
- else
- {
- string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId");
- if(managerAdapterId.empty())
+ else
{
- cerr << appName() << ": property `IceBox.ServiceManager.AdapterId' is not set" << endl;
- return EXIT_FAILURE;
+ string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId");
+ if(managerAdapterId.empty())
+ {
+ cerr << appName() << ": property `IceBoxAdmin.ServiceManager.Proxy' is not set" << endl;
+ return EXIT_FAILURE;
+ }
+
+ managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" @" + managerAdapterId;
}
- managerProxy = "\"" + communicator()->identityToString(managerIdentity) + "\" @" + managerAdapterId;
+ base = communicator()->stringToProxy(managerProxy);
}
- ObjectPrx base = communicator()->stringToProxy(managerProxy);
IceBox::ServiceManagerPrx manager = IceBox::ServiceManagerPrx::checkedCast(base);
if(!manager)
{
- cerr << appName() << ": `" << managerProxy << "' is not running" << endl;
+ cerr << appName() << ": `" << base << "' is not an IceBox::ServiceManager" << endl;
return EXIT_FAILURE;
}
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index c7763662b2b..4920a9b2436 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -28,14 +28,17 @@ iceBox = TestUtil.getIceBox(testdir)
iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
-iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator='
-
iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \
' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \
' --IceStorm.Publish.Endpoints="default"' + \
" --IceBox.PrintServicesReady=IceStorm" + \
- " --IceBox.InheritProperties=1"
-iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"'
+ " --IceBox.InheritProperties=1" + \
+ ' --Ice.Admin.Endpoints="default -p 12010"' + \
+ " --Ice.Admin.InstanceName=IceBox"
+
+serviceManagerProxy = ' --IceBoxAdmin.ServiceManager.Proxy="IceBox/admin -f IceBox.ServiceManager:default -p 12010"'
+
+iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"'
def doTest(batch):
global testdir
@@ -79,7 +82,7 @@ TestUtil.cleanDbDir(dbHome)
iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome
print "starting icestorm service...",
-command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceStormService + iceStormDBEnv
if TestUtil.debug:
print "(" + command + ")",
iceBoxPipe = os.popen(command + " 2>&1")
@@ -133,7 +136,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + serviceManagerProxy + r' shutdown'
if TestUtil.debug:
print "(" + command + ")",
iceBoxAdminPipe = os.popen(command + " 2>&1")
diff --git a/cs/demo/IceBox/hello/config.admin b/cs/demo/IceBox/hello/config.admin
index 32ee394107a..a5c17db1204 100755
--- a/cs/demo/IceBox/hello/config.admin
+++ b/cs/demo/IceBox/hello/config.admin
@@ -1,12 +1,13 @@
#
-# The IceBox instance name is used to set the category field of the
-# IceBox ServiceManager identity.
+# Proxy to the IceBox ServiceManager:
#
-IceBox.InstanceName=DemoIceBox
#
-# The IceBox server endpoint configuration
+# When the IceBox.ServiceManager object adapter is configured:
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998
-
+#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1
+#
+# When Ice.Admin is configured:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1
diff --git a/cs/demo/IceBox/hello/config.icebox b/cs/demo/IceBox/hello/config.icebox
index dd43baf0ddd..bc91a23da6f 100644
--- a/cs/demo/IceBox/hello/config.icebox
+++ b/cs/demo/IceBox/hello/config.icebox
@@ -1,13 +1,37 @@
#
+# The IceBox ServiceManager object can be provided by configuring
+# IceBox.ServiceManager.Endpoints (and optionally
+# IceBox.InstanceName), or as a facet of the Ice.Admin object
+# (or both if you like). Make sure to keep config.admin
+# synchronized with these settings.
+#
+
+#
+# IceBox.ServiceManager configuration
+#
+
+#
# The IceBox instance name is used to set the category field of the
# IceBox ServiceManager identity.
#
-IceBox.InstanceName=DemoIceBox
+#IceBox.InstanceName=DemoIceBox
+
+#
+# The IceBox server endpoint configuration
+#
+#IceBox.ServiceManager.Endpoints=tcp -p 9998 -h 127.0.0.1
+
+
+#
+# Ice.Admin configuration
+#
#
-# The IceBox server endpoint configuration.
+# Enable Ice.Admin object:
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999
+Ice.Admin.InstanceName=DemoIceBox
+Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+
#
# The hello service
@@ -36,13 +60,3 @@ Ice.Warn.Connections=1
# 1 = trace protocol messages
#
#Ice.Trace.Protocol=1
-
-#
-# SSL plugin configuration
-#
-Ice.Plugin.IceSSL=icesslcs, Version=3.3.0.0, Culture=neutral, PublicKeyToken=1f998c50fec78381:IceSSL.PluginFactory
-IceSSL.DefaultDir=../../../certs
-IceSSL.ImportCert.CurrentUser.Root=cacert.pem
-IceSSL.CertFile=s_rsa1024.pfx
-IceSSL.Password=password
-Ice.ThreadPerConnection=1
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index 76ed8886cae..7450e447cdf 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 19:26:30 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -146,6 +146,21 @@ namespace IceInternal
null
};
+ public static Property[] IceBoxAdminProps =
+ {
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.EndpointSelection$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.ConnectionCached$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.PreferSecure$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.LocatorCacheTimeout$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Locator$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Router$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.CollocationOptimization$", true, @"IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized"),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.CollocationOptimized$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.ThreadPerConnection$", false, null),
+ new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy$", false, null),
+ null
+ };
+
public static Property[] IceGridAdminProps =
{
new Property(@"^IceGridAdmin\.AuthenticateUsingSSL$", false, null),
@@ -589,6 +604,7 @@ namespace IceInternal
{
IceProps,
IceBoxProps,
+ IceBoxAdminProps,
IceGridAdminProps,
IceGridProps,
IcePatch2Props,
@@ -604,6 +620,7 @@ namespace IceInternal
{
"Ice",
"IceBox",
+ "IceBoxAdmin",
"IceGridAdmin",
"IceGrid",
"IcePatch2",
diff --git a/demoscript/IceBox/hello.py b/demoscript/IceBox/hello.py
index 7932dd64ad2..b31e21903f5 100755
--- a/demoscript/IceBox/hello.py
+++ b/demoscript/IceBox/hello.py
@@ -65,7 +65,7 @@ def run(client, server):
client.sendline('x')
client.waitTestSuccess()
- admin = demoscript.Util.spawn('iceboxadmin --IceBox.InstanceName=DemoIceBox --IceBox.ServiceManager.Endpoints="tcp -p 9998:ssl -p 9999" shutdown', language="C++")
+ admin = demoscript.Util.spawn('iceboxadmin --IceBoxAdmin.ServiceManager.Proxy="DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1" shutdown', language="C++")
admin.waitTestSuccess()
server.waitTestSuccess()
diff --git a/java/demo/IceBox/hello/README b/java/demo/IceBox/hello/README
index 7691dd3a52e..f78a94616ce 100644
--- a/java/demo/IceBox/hello/README
+++ b/java/demo/IceBox/hello/README
@@ -9,4 +9,4 @@ $ java Client
To shut down IceBox, use IceBox.Admin:
-$ java IceBox.Admin --Ice.Config=config.icebox shutdown
+$ java IceBox.Admin --Ice.Config=config.admin shutdown
diff --git a/java/demo/IceBox/hello/config.admin b/java/demo/IceBox/hello/config.admin
new file mode 100644
index 00000000000..4e148e8a316
--- /dev/null
+++ b/java/demo/IceBox/hello/config.admin
@@ -0,0 +1,14 @@
+#
+# Proxy to the IceBox ServiceManager:
+#
+
+#
+# When the IceBox.ServiceManager object adapter is configured:
+#
+#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1
+
+#
+# When Ice.Admin is configured:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1
+
diff --git a/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox
index 0d2f8cfade0..7eea4e10bfd 100644
--- a/java/demo/IceBox/hello/config.icebox
+++ b/java/demo/IceBox/hello/config.icebox
@@ -1,13 +1,37 @@
#
+# The IceBox ServiceManager object can be provided by configuring
+# IceBox.ServiceManager.Endpoints (and optionally
+# IceBox.InstanceName), or as a facet of the Ice.Admin object
+# (or both if you like). Make sure to keep config.admin
+# synchronized with these settings.
+#
+
+#
+# IceBox.ServiceManager configuration
+#
+
+#
# The IceBox instance name is used to set the category field of the
# IceBox ServiceManager identity.
#
-IceBox.InstanceName=DemoIceBox
+#IceBox.InstanceName=DemoIceBox
#
# The IceBox server endpoint configuration
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+#IceBox.ServiceManager.Endpoints=tcp -p 9998 -h 127.0.0.1
+
+
+#
+# Ice.Admin configuration
+#
+
+#
+# Enable Ice.Admin object:
+#
+Ice.Admin.InstanceName=DemoIceBox
+Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+
#
# The hello service
diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java
index d83b4d1cc15..796b62a9aea 100644
--- a/java/src/IceBox/Admin.java
+++ b/java/src/IceBox/Admin.java
@@ -59,41 +59,51 @@ public final class Admin
return 0;
}
- Ice.Properties properties = communicator().getProperties();
+ Ice.ObjectPrx base = communicator().propertyToProxy("IceBoxAdmin.ServiceManager.Proxy");
- Ice.Identity managerIdentity = new Ice.Identity();
- managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
- managerIdentity.name = "ServiceManager";
-
- String managerProxy;
- if(properties.getProperty("Ice.Default.Locator").length() == 0)
+ if(base == null)
{
- String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
- if(managerEndpoints.length() == 0)
+ //
+ // The old deprecated way to retrieve the service manager proxy
+ //
+
+ Ice.Properties properties = communicator().getProperties();
+
+ Ice.Identity managerIdentity = new Ice.Identity();
+ managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox");
+ managerIdentity.name = "ServiceManager";
+
+ String managerProxy;
+ if(properties.getProperty("Ice.Default.Locator").length() == 0)
{
- System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set");
- return 1;
+ String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints");
+ if(managerEndpoints.length() == 0)
+ {
+ System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+ return 1;
+ }
+
+ managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints;
}
-
- managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints;
- }
- else
- {
- String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
- if(managerAdapterId.length() == 0)
+ else
{
- System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set");
- return 1;
+ String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId");
+ if(managerAdapterId.length() == 0)
+ {
+ System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set");
+ return 1;
+ }
+
+ managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId;
}
-
- managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId;
+
+ base = communicator().stringToProxy(managerProxy);
}
- Ice.ObjectPrx base = communicator().stringToProxy(managerProxy);
IceBox.ServiceManagerPrx manager = IceBox.ServiceManagerPrxHelper.checkedCast(base);
if(manager == null)
{
- System.err.println(appName() + ": `" + managerProxy + "' is not running");
+ System.err.println(appName() + ": `" + base.toString() + "' is not an IceBox::ServiceManager");
return 1;
}
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 0786a86d5a0..2ffa86d977f 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, Wed Sep 26 17:22:42 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 19:26:30 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -146,6 +146,21 @@ public final class PropertyNames
null
};
+ public static final Property IceBoxAdminProps[] =
+ {
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EndpointSelection", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ConnectionCached", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.PreferSecure", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.LocatorCacheTimeout", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Locator", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Router", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimization", true, "IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized"),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimized", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ThreadPerConnection", false, null),
+ new Property("IceBoxAdmin\\.ServiceManager\\.Proxy", false, null),
+ null
+ };
+
public static final Property IceGridAdminProps[] =
{
new Property("IceGridAdmin\\.AuthenticateUsingSSL", false, null),
@@ -590,6 +605,7 @@ public final class PropertyNames
{
IceProps,
IceBoxProps,
+ IceBoxAdminProps,
IceGridAdminProps,
IceGridProps,
IcePatch2Props,
@@ -605,6 +621,7 @@ public final class PropertyNames
{
"Ice",
"IceBox",
+ "IceBoxAdmin",
"IceGridAdmin",
"IceGrid",
"IcePatch2",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 19:57:18 +0000