summaryrefslogtreecommitdiff
path: root/slice
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-09-24 21:06:55 +0200
committerJose <jose@zeroc.com>2014-09-24 21:06:55 +0200
commitb1087d646fa93c4208dd227d0c9df323ff7c858b (patch)
tree48532138bffdfac0dc5c818593d9c1958cfeeeb5 /slice
parentPHP dependency fixes (diff)
downloadice-b1087d646fa93c4208dd227d0c9df323ff7c858b.tar.bz2
ice-b1087d646fa93c4208dd227d0c9df323ff7c858b.tar.xz
ice-b1087d646fa93c4208dd227d0c9df323ff7c858b.zip
Fixed (ICE-5511) - Consider removing the deprecated AMI mapping
Diffstat (limited to 'slice')
-rw-r--r--slice/Ice/ConnectionF.ice1
-rw-r--r--slice/Ice/EndpointF.ice2
-rw-r--r--slice/IceGrid/Admin.ice4
3 files changed, 5 insertions, 2 deletions
diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice
index 34432b361cd..4fa823e42e1 100644
--- a/slice/Ice/ConnectionF.ice
+++ b/slice/Ice/ConnectionF.ice
@@ -15,6 +15,7 @@ module Ice
{
local class ConnectionInfo;
+local class WSConnectionInfo;
local interface Connection;
};
diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice
index 6ea1cab28f8..569949beca4 100644
--- a/slice/Ice/EndpointF.ice
+++ b/slice/Ice/EndpointF.ice
@@ -15,8 +15,10 @@ module Ice
{
local class EndpointInfo;
+//local class IPEndpointInfo;
local class TCPEndpointInfo;
local class UDPEndpointInfo;
+local class WSEndpointInfo;
local interface Endpoint;
/**
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index f76459cc0c6..5a1e435d188 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -471,7 +471,7 @@ interface Admin
* doesn't exist.
*
**/
- ["ami"] void syncApplicationWithoutRestart(ApplicationDescriptor descriptor)
+ void syncApplicationWithoutRestart(ApplicationDescriptor descriptor)
throws AccessDeniedException, DeploymentException, ApplicationNotExistException;
/**
@@ -495,7 +495,7 @@ interface Admin
* doesn't exist.
*
**/
- ["ami"] void updateApplicationWithoutRestart(ApplicationUpdateDescriptor descriptor)
+ void updateApplicationWithoutRestart(ApplicationUpdateDescriptor descriptor)
throws AccessDeniedException, DeploymentException, ApplicationNotExistException;
/**