HEAD:(zeroc-ice/ice@1c0ecdd1c6) Remove IceGrid, IceBox etc for Ruby a…

…nd PHP (zeroc-ice/ice#2466)

slice2cpp/cpp/src/IceGrid/Internal.cpp

@@ -1592,11 +1592,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<
             {
                 ex.ice_throw();
             }
-            catch(const AdapterExistsException&)
+            catch(const AdapterNotExistException&)
             {
                 throw;
             }
-            catch(const AdapterNotExistException&)
+            catch(const AdapterExistsException&)
             {
                 throw;
             }
@@ -1708,11 +1708,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
@@ -1758,11 +1758,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }

slice2cpp/slice/IceGrid/Admin.cpp

@@ -79,11 +79,11 @@ IceGrid::AdminPrx::_iceI_addApplication(const ::std::shared_ptr<::IceInternal::O
             {
                 ex.ice_throw();
             }
-            catch(const DeploymentException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -129,15 +129,15 @@ IceGrid::AdminPrx::_iceI_syncApplication(const ::std::shared_ptr<::IceInternal::
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -183,15 +183,15 @@ IceGrid::AdminPrx::_iceI_updateApplication(const ::std::shared_ptr<::IceInternal
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -237,15 +237,15 @@ IceGrid::AdminPrx::_iceI_syncApplicationWithoutRestart(const ::std::shared_ptr<:
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -291,15 +291,15 @@ IceGrid::AdminPrx::_iceI_updateApplicationWithoutRestart(const ::std::shared_ptr
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -344,15 +344,15 @@ IceGrid::AdminPrx::_iceI_removeApplication(const ::std::shared_ptr<::IceInternal
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -397,15 +397,15 @@ IceGrid::AdminPrx::_iceI_instantiateServer(const ::std::shared_ptr<::IceInternal
             {
                 ex.ice_throw();
             }
-            catch(const ApplicationNotExistException&)
+            catch(const AccessDeniedException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ApplicationNotExistException&)
             {
                 throw;
             }
-            catch(const AccessDeniedException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
@@ -1040,19 +1040,19 @@ IceGrid::AdminPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outgo
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const BadSignalException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const BadSignalException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3213,19 +3213,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3270,19 +3270,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3327,19 +3327,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3384,15 +3384,15 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdErr(const ::std::shared_ptr<::IceInte
             {
                 ex.ice_throw();
             }
-            catch(const NodeNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const NodeNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3437,15 +3437,15 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdOut(const ::std::shared_ptr<::IceInte
             {
                 ex.ice_throw();
             }
-            catch(const NodeNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const NodeNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3490,15 +3490,15 @@ IceGrid::AdminSessionPrx::_iceI_openRegistryStdErr(const ::std::shared_ptr<::Ice
             {
                 ex.ice_throw();
             }
-            catch(const RegistryNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const RegistryUnreachableException&)
+            catch(const RegistryNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const RegistryUnreachableException&)
             {
                 throw;
             }
@@ -3543,15 +3543,15 @@ IceGrid::AdminSessionPrx::_iceI_openRegistryStdOut(const ::std::shared_ptr<::Ice
             {
                 ex.ice_throw();
             }
-            catch(const RegistryNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const RegistryUnreachableException&)
+            catch(const RegistryNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const RegistryUnreachableException&)
             {
                 throw;
             }

slice2cs/cpp/src/IceGrid/Internal.cs

@@ -6086,11 +6086,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl
                     {
                         throw ex;
                     }
-                    catch(AdapterNotExistException)
+                    catch(AdapterExistsException)
                     {
                         throw;
                     }
-                    catch(AdapterExistsException)
+                    catch(AdapterNotExistException)
                     {
                         throw;
                     }
@@ -6504,11 +6504,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(NodeActiveException)
                     {
                         throw;
                     }
-                    catch(NodeActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
@@ -6560,11 +6560,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(ReplicaActiveException)
                     {
                         throw;
                     }
-                    catch(ReplicaActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }

slice2cs/csharp/test/Ice/location/Test.cs

@@ -1242,12 +1242,12 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi
         {
             public abstract void addObject(global::Ice.ObjectPrx? obj, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current);
+
             public override string ice_id(Ice.Current current) => ice_staticId();
 
             public static new string ice_staticId() => "::Test::TestLocatorRegistry";