summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-09-30 05:05:40 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-09-30 05:05:40 +0000
commit5b09c30824c73891b2e8a8fa1aad5925ee77c2d5 (patch)
tree3fffb7203973521d5c47f29e2eb2b7f6e683d6bb /java/src
parentAdded support for <adapter name>.ReplicaId. (diff)
downloadice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.tar.bz2
ice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.tar.xz
ice-5b09c30824c73891b2e8a8fa1aad5925ee77c2d5.zip
Added support for <adapter name>.ReplicaId and IceGrid demo fixes.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/ObjectAdapterI.java13
-rwxr-xr-xjava/src/IceGrid/TreeNode/Adapters.java1
-rw-r--r--java/src/IceInternal/PropertyNames.java25
3 files changed, 27 insertions, 12 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index a7000f4c7f1..4a3383caf86 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -34,6 +34,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
Ice.LocatorRegistryPrx locatorRegistry = null;
boolean registerProcess = false;
String serverId = "";
+ String replicaId = "";
Communicator communicator = null;
boolean printAdapterReady = false;
@@ -50,6 +51,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
registerProcess = _instance.properties().getPropertyAsInt(_name + ".RegisterProcess") > 0;
serverId = _instance.properties().getProperty("Ice.ServerId");
+ replicaId = _instance.properties().getPropertyWithDefault(_name + ".ReplicaId", serverId);
printAdapterReady = _instance.properties().getPropertyAsInt("Ice.PrintAdapterReady") > 0;
if(registerProcess && locatorRegistry == null)
@@ -95,24 +97,17 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
Identity ident = new Identity();
ident.category = "";
ident.name = "dummy";
- locatorRegistry.setAdapterDirectProxy(serverId, _id, createDirectProxy(ident));
+ locatorRegistry.setAdapterDirectProxy(_id, replicaId, createDirectProxy(ident));
}
catch(ObjectAdapterDeactivatedException ex)
{
// IGNORE: The object adapter is already inactive.
}
- catch(ServerNotFoundException ex)
- {
- NotRegisteredException ex1 = new NotRegisteredException();
- ex1.id = serverId;
- ex1.kindOfObject = "server";
- throw ex1;
- }
catch(AdapterNotFoundException ex)
{
NotRegisteredException ex1 = new NotRegisteredException();
- ex1.id = _id;
ex1.kindOfObject = "object adapter";
+ ex1.id = ex.replica ? _id + " (replica = " + replicaId + ")" : _id;
throw ex1;
}
catch(AdapterAlreadyActiveException ex)
diff --git a/java/src/IceGrid/TreeNode/Adapters.java b/java/src/IceGrid/TreeNode/Adapters.java
index 15c70c6dfeb..8e9daab8f75 100755
--- a/java/src/IceGrid/TreeNode/Adapters.java
+++ b/java/src/IceGrid/TreeNode/Adapters.java
@@ -177,6 +177,7 @@ class Adapters extends ListParent
descriptor = new AdapterDescriptor(
name,
defaultId,
+ "", // TODO: ReplicaId
false,
true,
new java.util.LinkedList());
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index ff5f93ec2db..570c83ebeb8 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.def', Mon Sep 12 14:49:01 2005
+// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Sep 29 15:54:59 2005
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -83,6 +83,7 @@ public final class PropertyNames
"^IceBox\\.PrintServicesReady$",
"^IceBox\\.Service\\.[^\\s.]+$",
"^IceBox\\.ServiceManager\\.AdapterId$",
+ "^IceBox\\.ServiceManager\\.ReplicaId$",
"^IceBox\\.ServiceManager\\.Endpoints$",
"^IceBox\\.ServiceManager\\.Identity$",
"^IceBox\\.ServiceManager\\.PublishedEndpoints$",
@@ -98,6 +99,7 @@ public final class PropertyNames
public static final String IcePackProps[] =
{
"^IcePack\\.Node\\.AdapterId$",
+ "^IcePack\\.Node\\.ReplicaId$",
"^IcePack\\.Node\\.CollocateRegistry$",
"^IcePack\\.Node\\.Data$",
"^IcePack\\.Node\\.Endpoints$",
@@ -117,6 +119,7 @@ public final class PropertyNames
"^IcePack\\.Node\\.WaitTime$",
"^IcePack\\.Node\\.BackgroundRegistration$",
"^IcePack\\.Registry\\.Admin\\.AdapterId$",
+ "^IcePack\\.Registry\\.Admin\\.ReplicaId$",
"^IcePack\\.Registry\\.Admin\\.Endpoints$",
"^IcePack\\.Registry\\.Admin\\.PublishedEndpoints$",
"^IcePack\\.Registry\\.Admin\\.ThreadPool\\.Size$",
@@ -125,6 +128,7 @@ public final class PropertyNames
"^IcePack\\.Registry\\.Admin\\.ThreadPool\\.StackSize$",
"^IcePack\\.Registry\\.AdminIdentity$",
"^IcePack\\.Registry\\.Client\\.AdapterId$",
+ "^IcePack\\.Registry\\.Client\\.ReplicaId$",
"^IcePack\\.Registry\\.Client\\.Endpoints$",
"^IcePack\\.Registry\\.Client\\.PublishedEndpoints$",
"^IcePack\\.Registry\\.Client\\.ThreadPool\\.Size$",
@@ -134,6 +138,7 @@ public final class PropertyNames
"^IcePack\\.Registry\\.Data$",
"^IcePack\\.Registry\\.DynamicRegistration$",
"^IcePack\\.Registry\\.Internal\\.AdapterId$",
+ "^IcePack\\.Registry\\.Internal\\.ReplicaId$",
"^IcePack\\.Registry\\.Internal\\.Endpoints$",
"^IcePack\\.Registry\\.Internal\\.PublishedEndpoints$",
"^IcePack\\.Registry\\.Internal\\.ThreadPool\\.Size$",
@@ -143,6 +148,7 @@ public final class PropertyNames
"^IcePack\\.Registry\\.LocatorIdentity$",
"^IcePack\\.Registry\\.QueryIdentity$",
"^IcePack\\.Registry\\.Server\\.AdapterId$",
+ "^IcePack\\.Registry\\.Server\\.ReplicaId$",
"^IcePack\\.Registry\\.Server\\.Endpoints$",
"^IcePack\\.Registry\\.Server\\.PublishedEndpoints$",
"^IcePack\\.Registry\\.Server\\.ThreadPool\\.Size$",
@@ -159,10 +165,12 @@ public final class PropertyNames
public static final String IceGridProps[] =
{
"^IceGrid\\.Node\\.AdapterId$",
+ "^IceGrid\\.Node\\.ReplicaId$",
"^IceGrid\\.Node\\.RegisterProcess$",
"^IceGrid\\.Node\\.CollocateRegistry$",
"^IceGrid\\.Node\\.Data$",
"^IceGrid\\.Node\\.Endpoints$",
+ "^IceGrid\\.Node\\.KeepAliveTimeout$",
"^IceGrid\\.Node\\.Name$",
"^IceGrid\\.Node\\.Output$",
"^IceGrid\\.Node\\.PrintServersReady$",
@@ -178,8 +186,8 @@ public final class PropertyNames
"^IceGrid\\.Node\\.Trace\\.Server$",
"^IceGrid\\.Node\\.Trace\\.Patch$",
"^IceGrid\\.Node\\.WaitTime$",
- "^IceGrid\\.Node\\.BackgroundRegistration$",
"^IceGrid\\.Registry\\.Admin\\.AdapterId$",
+ "^IceGrid\\.Registry\\.Admin\\.ReplicaId$",
"^IceGrid\\.Registry\\.Admin\\.Endpoints$",
"^IceGrid\\.Registry\\.Admin\\.PublishedEndpoints$",
"^IceGrid\\.Registry\\.Admin\\.ThreadPool\\.Size$",
@@ -188,6 +196,7 @@ public final class PropertyNames
"^IceGrid\\.Registry\\.Admin\\.ThreadPool\\.StackSize$",
"^IceGrid\\.Registry\\.AdminIdentity$",
"^IceGrid\\.Registry\\.Client\\.AdapterId$",
+ "^IceGrid\\.Registry\\.Client\\.ReplicaId$",
"^IceGrid\\.Registry\\.Client\\.Endpoints$",
"^IceGrid\\.Registry\\.Client\\.PublishedEndpoints$",
"^IceGrid\\.Registry\\.Client\\.ThreadPool\\.Size$",
@@ -197,6 +206,7 @@ public final class PropertyNames
"^IceGrid\\.Registry\\.Data$",
"^IceGrid\\.Registry\\.DynamicRegistration$",
"^IceGrid\\.Registry\\.Internal\\.AdapterId$",
+ "^IceGrid\\.Registry\\.Internal\\.ReplicaId$",
"^IceGrid\\.Registry\\.Internal\\.Endpoints$",
"^IceGrid\\.Registry\\.Internal\\.PublishedEndpoints$",
"^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Size$",
@@ -204,8 +214,10 @@ public final class PropertyNames
"^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn$",
"^IceGrid\\.Registry\\.Internal\\.ThreadPool\\.StackSize$",
"^IceGrid\\.Registry\\.LocatorIdentity$",
+ "^IceGrid\\.Registry\\.NodeSessionTimeout$",
"^IceGrid\\.Registry\\.QueryIdentity$",
"^IceGrid\\.Registry\\.Server\\.AdapterId$",
+ "^IceGrid\\.Registry\\.Server\\.ReplicaId$",
"^IceGrid\\.Registry\\.Server\\.Endpoints$",
"^IceGrid\\.Registry\\.Server\\.PublishedEndpoints$",
"^IceGrid\\.Registry\\.Server\\.ThreadPool\\.Size$",
@@ -237,7 +249,9 @@ public final class PropertyNames
public static final String IcePatch2Props[] =
{
"^IcePatch2\\.AdapterId$",
+ "^IcePatch2\\.ReplicaId$",
"^IcePatch2\\.Admin\\.AdapterId$",
+ "^IcePatch2\\.Admin\\.ReplicaId$",
"^IcePatch2\\.Admin\\.Endpoints$",
"^IcePatch2\\.Admin\\.PublishedEndpoints$",
"^IcePatch2\\.Admin\\.ThreadPool\\.Size$",
@@ -298,6 +312,7 @@ public final class PropertyNames
{
"^IceStorm\\.Flush\\.Timeout$",
"^IceStorm\\.Publish\\.AdapterId$",
+ "^IceStorm\\.Publish\\.ReplicaId$",
"^IceStorm\\.Publish\\.Endpoints$",
"^IceStorm\\.Publish\\.PublishedEndpoints$",
"^IceStorm\\.Publish\\.RegisterProcess$",
@@ -305,7 +320,7 @@ public final class PropertyNames
"^IceStorm\\.Publish\\.ThreadPool\\.SizeMax$",
"^IceStorm\\.Publish\\.ThreadPool\\.SizeWarn$",
"^IceStorm\\.Publish\\.ThreadPool\\.StackSize$",
- "^IceStorm\\.TopicManager\\.AdapterId$",
+ "^IceStorm\\.TopicManager\\.ReplicaId$",
"^IceStorm\\.TopicManager\\.Endpoints$",
"^IceStorm\\.TopicManager\\.Proxy$",
"^IceStorm\\.TopicManager\\.PublishedEndpoints$",
@@ -325,8 +340,10 @@ public final class PropertyNames
{
"^Glacier\\.Router\\.AcceptCert$",
"^Glacier\\.Router\\.AdapterId$",
+ "^Glacier\\.Router\\.ReplicaId$",
"^Glacier\\.Router\\.AllowCategories$",
"^Glacier\\.Router\\.Client\\.AdapterId$",
+ "^Glacier\\.Router\\.Client\\.ReplicaId$",
"^Glacier\\.Router\\.Client\\.Endpoints$",
"^Glacier\\.Router\\.Client\\.ForwardContext$",
"^Glacier\\.Router\\.Client\\.PublishedEndpoints$",
@@ -341,6 +358,7 @@ public final class PropertyNames
"^Glacier\\.Router\\.PrintProxyOnFd$",
"^Glacier\\.Router\\.PublishedEndpoints$",
"^Glacier\\.Router\\.Server\\.AdapterId$",
+ "^Glacier\\.Router\\.Server\\.ReplicaId$",
"^Glacier\\.Router\\.Server\\.Endpoints$",
"^Glacier\\.Router\\.Server\\.ForwardContext$",
"^Glacier\\.Router\\.Server\\.PublishedEndpoints$",
@@ -361,6 +379,7 @@ public final class PropertyNames
"^Glacier\\.Router\\.Trace\\.Throttle$",
"^Glacier\\.Router\\.UserId$",
"^Glacier\\.Starter\\.AdapterId$",
+ "^Glacier\\.Starter\\.ReplicaId$",
"^Glacier\\.Starter\\.AddUserToAllowCategories$",
"^Glacier\\.Starter\\.Certificate\\.BitStrength$",
"^Glacier\\.Starter\\.Certificate\\.CommonName$",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 18:59:12 +0000