summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ObjectAdapterI.java2
-rw-r--r--java/src/IceDiscovery/PluginI.java3
-rw-r--r--java/src/IceInternal/PropertyNames.java170
3 files changed, 171 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index e661c886007..c8760a558d7 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1265,7 +1265,7 @@ public final class ObjectAdapterI implements ObjectAdapter
}
}
- if(_instance.traceLevels().network >= 1)
+ if(_instance.traceLevels().network >= 1 && !endpoints.isEmpty())
{
StringBuffer s = new StringBuffer("published endpoints for object adapter `");
s.append(_name);
diff --git a/java/src/IceDiscovery/PluginI.java b/java/src/IceDiscovery/PluginI.java
index 9f90c8b251a..a853730bc02 100644
--- a/java/src/IceDiscovery/PluginI.java
+++ b/java/src/IceDiscovery/PluginI.java
@@ -113,8 +113,7 @@ public class PluginI implements Ice.Plugin
// Setup locator on the communicator.
//
Ice.ObjectPrx locator = _locatorAdapter.addWithUUID(new LocatorI(lookup, locatorRegistryPrx));
- _communicator.setDefaultLocator(
- Ice.LocatorPrxHelper.uncheckedCast(_communicator.stringToProxy(locator.toString())));
+ _communicator.setDefaultLocator(Ice.LocatorPrxHelper.uncheckedCast(locator));
_multicastAdapter.activate();
_replyAdapter.activate();
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 51aaf7ee700..54ca60095a9 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Jun 5 21:19:31 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Jul 9 18:08:33 2014
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -312,6 +312,90 @@ public final class PropertyNames
null
};
+ public static final Property IceGridDiscoveryProps[] =
+ {
+ new Property("IceGridDiscovery\\.Reply\\.ACM\\.Timeout", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ACM\\.Heartbeat", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ACM\\.Close", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ACM", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.AdapterId", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Endpoints", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.EndpointSelection", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.ConnectionCached", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.PreferSecure", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.InvocationTimeout", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.CollocationOptimized", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.PublishedEndpoints", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ReplicaGroupId", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.EndpointSelection", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.ConnectionCached", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.PreferSecure", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.InvocationTimeout", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.CollocationOptimized", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ProxyOptions", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.Size", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.SizeMax", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.SizeWarn", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.StackSize", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.Serialize", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", false, null),
+ new Property("IceGridDiscovery\\.Reply\\.ThreadPool\\.ThreadPriority", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ACM\\.Timeout", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ACM\\.Heartbeat", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ACM\\.Close", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ACM", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.AdapterId", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Endpoints", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.EndpointSelection", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.ConnectionCached", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.PreferSecure", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.InvocationTimeout", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.CollocationOptimized", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.PublishedEndpoints", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ReplicaGroupId", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.EndpointSelection", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.ConnectionCached", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.PreferSecure", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.InvocationTimeout", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.Locator", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.CollocationOptimized", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.Router", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ProxyOptions", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.Size", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.SizeMax", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.SizeWarn", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.StackSize", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.Serialize", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", false, null),
+ new Property("IceGridDiscovery\\.Locator\\.ThreadPool\\.ThreadPriority", false, null),
+ new Property("IceGridDiscovery\\.Lookup", false, null),
+ new Property("IceGridDiscovery\\.Timeout", false, null),
+ new Property("IceGridDiscovery\\.RetryCount", false, null),
+ new Property("IceGridDiscovery\\.Address", false, null),
+ new Property("IceGridDiscovery\\.Port", false, null),
+ new Property("IceGridDiscovery\\.Interface", false, null),
+ new Property("IceGridDiscovery\\.InstanceName", false, null),
+ null
+ };
+
public static final Property IceBoxProps[] =
{
new Property("IceBox\\.InheritProperties", false, null),
@@ -382,6 +466,48 @@ public final class PropertyNames
new Property("IceGridAdmin\\.Username", false, null),
new Property("IceGridAdmin\\.Password", false, null),
new Property("IceGridAdmin\\.Replica", false, null),
+ new Property("IceGridAdmin\\.Host", false, null),
+ new Property("IceGridAdmin\\.Port", false, null),
+ new Property("IceGridAdmin\\.InstanceName", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Address", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Interface", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Lookup", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Timeout", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Heartbeat", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Close", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.AdapterId", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Endpoints", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.EndpointSelection", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.ConnectionCached", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.PreferSecure", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.InvocationTimeout", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Locator", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Router", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.CollocationOptimized", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.PublishedEndpoints", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ReplicaGroupId", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.EndpointSelection", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.ConnectionCached", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.PreferSecure", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.LocatorCacheTimeout", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.InvocationTimeout", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Locator", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Router", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.CollocationOptimized", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ProxyOptions", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Size", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeMax", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeWarn", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.StackSize", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Serialize", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", false, null),
+ new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadPriority", false, null),
new Property("IceGridAdmin\\.Trace\\.Observers", false, null),
new Property("IceGridAdmin\\.Trace\\.SaveToRegistry", false, null),
null
@@ -587,6 +713,46 @@ public final class PropertyNames
new Property("IceGrid\\.Registry\\.CryptPasswords", false, null),
new Property("IceGrid\\.Registry\\.Data", false, null),
new Property("IceGrid\\.Registry\\.DefaultTemplates", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Timeout", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Heartbeat", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Close", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ACM", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.AdapterId", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Endpoints", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.EndpointSelection", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.ConnectionCached", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.PreferSecure", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.LocatorCacheTimeout", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.InvocationTimeout", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Locator", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Router", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.CollocationOptimized", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Locator", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.PublishedEndpoints", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ReplicaGroupId", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.EndpointSelection", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.ConnectionCached", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.PreferSecure", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.LocatorCacheTimeout", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.InvocationTimeout", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Locator", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Router", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.CollocationOptimized", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Context\\.[^\\s]+", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Router", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ProxyOptions", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Size", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeMax", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeWarn", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.StackSize", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Serialize", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadIdleTime", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadPriority", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Enabled", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Address", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Port", false, null),
+ new Property("IceGrid\\.Registry\\.Discovery\\.Interface", false, null),
new Property("IceGrid\\.Registry\\.DynamicRegistration", false, null),
new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Timeout", false, null),
new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Heartbeat", false, null),
@@ -1036,6 +1202,7 @@ public final class PropertyNames
IceProps,
IceMXProps,
IceDiscoveryProps,
+ IceGridDiscoveryProps,
IceBoxProps,
IceBoxAdminProps,
IceGridAdminProps,
@@ -1054,6 +1221,7 @@ public final class PropertyNames
"Ice",
"IceMX",
"IceDiscovery",
+ "IceGridDiscovery",
"IceBox",
"IceBoxAdmin",
"IceGridAdmin",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 22:26:30 +0000