zeroc-ice 3.7.0 → 3.7.5

data/lib/IcePatch2.rb

@@ -1,10 +1,5 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IcePatch2/FileServer'

data/lib/IcePatch2/FileInfo.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Ice/BuiltinSequences.rb'
 
-module IcePatch2
+module ::IcePatch2
 
     if not defined?(::IcePatch2::FileInfo)
         class FileInfo

data/lib/IcePatch2/FileServer.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'IcePatch2/FileInfo.rb'
 
-module IcePatch2
+module ::IcePatch2
 
     if not defined?(::IcePatch2::T_ByteSeqSeq)
         T_ByteSeqSeq = ::Ice::__defineSequence('::IcePatch2::ByteSeqSeq', ::Ice::T_ByteSeq)

data/lib/IceStorm.rb

@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
 
 require 'IceStorm/IceStorm'
 require 'IceStorm/Metrics'

data/lib/IceStorm/IceStorm.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -24,7 +19,7 @@ require 'Ice/Identity.rb'
 require 'Ice/SliceChecksumDict.rb'
 require 'IceStorm/Metrics.rb'
 
-module IceStorm
+module ::IceStorm
 
     if not defined?(::IceStorm::T_Topic)
         T_Topic = ::Ice::__declareClass('::IceStorm::Topic')

data/lib/IceStorm/Metrics.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
 #
-# **********************************************************************
-#
-# Ice version 3.7.0
+# Ice version 3.7.5
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Ice/Metrics.rb'
 
-module IceMX
+module ::IceMX
 
     if not defined?(::IceMX::TopicMetrics_Mixin)
 

data/slice/Glacier2/Metrics.ice

@@ -1,24 +1,30 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/Metrics.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX"]
+["objc:prefix:ICEMX", "swift:module:Glacier2:MX"]
 module IceMX
 {
 

data/slice/Glacier2/PermissionsVerifier.ice

@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Glacier2/SSLInfo.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__

data/slice/Glacier2/PermissionsVerifierF.ice

@@ -1,15 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Glacier2/Router.ice

@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/Router.ice>
 #include <Glacier2/Session.ice>
 #include <Glacier2/PermissionsVerifier.ice>
@@ -46,7 +50,7 @@ exception SessionNotExistException
 
 /**
  *
- * The Glacier2 specialization of the <tt>Ice::Router</tt> interface.
+ * The Glacier2 specialization of the <code>Ice::Router</code> interface.
  *
  **/
 interface Router extends Ice::Router

data/slice/Glacier2/RouterF.ice

@@ -1,15 +1,19 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Glacier2/SSLInfo.ice

@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/BuiltinSequences.ice>
 
 #ifndef __SLICE2JAVA_COMPAT__

data/slice/Glacier2/Session.ice

@@ -1,17 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+[["cpp:dll-export:GLACIER2_API"]]
+[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
+[["cpp:header-ext:h"]]
 [["cpp:include:Glacier2/Config.h"]]
 
+[["js:module:ice"]]
+
+[["objc:dll-export:GLACIER2_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Glacier2"]]
+
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 #include <Glacier2/SSLInfo.ice>

data/slice/Ice/BuiltinSequences.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]

data/slice/Ice/Communicator.ice

@@ -1,15 +1,21 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["cpp:dll-export:ICE_API"]]
+[["cpp:doxygen:include:Ice/Ice.h"]]
+[["cpp:header-ext:h"]]
+
+[["ice-prefix"]]
+
+[["js:module:ice"]]
+
+[["objc:dll-export:ICE_API"]]
+[["objc:header-dir:objc"]]
+
+[["python:pkgdir:Ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/InstrumentationF.ice>
@@ -51,11 +57,12 @@ module Ice
  * @see Logger
  * @see ObjectAdapter
  * @see Properties
- * @see ObjectFactory
  * @see ValueFactory
  *
  **/
-["clr:implements:_System.IDisposable", "java:implements:java.lang.AutoCloseable", "php:internal"]
+["clr:implements:global::System.IDisposable", "java:implements:java.lang.AutoCloseable"]
+
+#if !defined(__SLICE2PHP__) && !defined(__SLICE2MATLAB__)
 local interface Communicator
 {
 
@@ -82,19 +89,18 @@ local interface Communicator
      * @see ObjectAdapter#destroy
      *
      **/
-    ["cpp:noexcept"] void destroy();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void destroy();
 
     /**
      *
-     * <p>Shuts down this communicator's server functionality, which
-     * includes the deactivation of all object adapters. (Attempts to use
-     * a deactivated object adapter raise {@link ObjectAdapterDeactivatedException}.)
-     * Subsequent calls to {@link #shutdown} are ignored.</p>
+     * Shuts down this communicator's server functionality, which
+     * includes the deactivation of all object adapters. Attempts to use a
+     * deactivated object adapter raise ObjectAdapterDeactivatedException.
+     * Subsequent calls to shutdown are ignored.
      *
-     * <p class="Note"> After {@link #shutdown} returns, no new requests are
-     * processed. However, requests that have been started before
-     * {@link #shutdown} was called might still be active. You can use
-     * {@link #waitForShutdown} to wait for the completion of all
+     * After shutdown returns, no new requests are processed. However, requests
+     * that have been started before shutdown was called might still be active.
+     * You can use {@link #waitForShutdown} to wait for the completion of all
      * requests.
      *
      * @see #destroy
@@ -102,29 +108,28 @@ local interface Communicator
      * @see ObjectAdapter#deactivate
      *
      **/
-    void shutdown();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void shutdown();
 
     /**
      *
      * Wait until the application has called {@link #shutdown} (or {@link #destroy}).
      * On the server side, this operation blocks the calling thread
      * until all currently-executing operations have completed.
-     * On the client side, the operation simply block until another
+     * On the client side, the operation simply blocks until another
      * thread has called {@link #shutdown} or {@link #destroy}.
      *
-     * <p>A typical use of this operation is to call it
-     * from the main thread, which then waits until some other thread
-     * calls {@link #shutdown}. After shut-down is complete, the main thread
-     * returns and can do some cleanup work before it finally calls
-     * {@link #destroy} to shut down the client functionality, and then
-     * exits the application.
+     * A typical use of this operation is to call it from the main thread,
+     * which then waits until some other thread calls {@link #shutdown}.
+     * After shut-down is complete, the main thread returns and can do some
+     * cleanup work before it finally calls {@link #destroy} to shut down
+     * the client functionality, and then exits the application.
      *
      * @see #shutdown
      * @see #destroy
      * @see ObjectAdapter#waitForDeactivate
      *
      **/
-    void waitForShutdown();
+    ["cpp:noexcept", "swift:noexcept", "js:async"] void waitForShutdown();
 
     /**
      *
@@ -135,24 +140,23 @@ local interface Communicator
      * @see #shutdown
      *
      **/
-    ["cpp:const"] bool isShutdown();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept"] bool isShutdown();
 
     /**
      *
      * Convert a stringified proxy into a proxy. For example,
-     * <tt>MyCategory/MyObject:tcp -h some_host -p
-     * 10000</tt> creates a proxy that refers to the Ice object
+     * <code>MyCategory/MyObject:tcp -h some_host -p
+     * 10000</code> creates a proxy that refers to the Ice object
      * having an identity with a name "MyObject" and a category
      * "MyCategory", with the server running on host "some_host", port
      * 10000. If the stringified proxy does not parse correctly, the
-     * operation throws one of {@link ProxyParseException},
-     * {@link EndpointParseException}, or {@link IdentityParseException}.
-     * An appendix in the Ice manual provides a detailed description
-     * of the syntax supported by stringified proxies.
+     * operation throws one of ProxyParseException, EndpointParseException,
+     * or IdentityParseException. Refer to the Ice manual for a detailed
+     * description of the syntax supported by stringified proxies.
      *
      * @param str The stringified proxy to convert into a proxy.
      *
-     * @return The proxy, or nil if <tt>str</tt> is an empty string.
+     * @return The proxy, or nil if <code>str</code> is an empty string.
      *
      * @see #proxyToString
      *
@@ -166,21 +170,21 @@ local interface Communicator
      * @param obj The proxy to convert into a stringified proxy.
      *
      * @return The stringified proxy, or an empty string if
-     * <tt>obj</tt> is nil.
+     * <code>obj</code> is nil.
      *
      * @see #stringToProxy
      *
      **/
-    ["cpp:const"] string proxyToString(Object* obj);
+    ["cpp:const", "swift:noexcept"] string proxyToString(Object* obj);
 
     /**
      *
      * Convert a set of proxy properties into a proxy. The "base"
-     * name supplied in the <tt>property</tt> argument refers to a
+     * name supplied in the <code>property</code> argument refers to a
      * property containing a stringified proxy, such as
-     * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
+     * <code>MyProxy=id:tcp -h localhost -p 10000</code>. Additional
      * properties configure local settings for the proxy, such as
-     * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
+     * <code>MyProxy.PreferSecure=1</code>. The "Properties"
      * appendix in the Ice manual describes each of the supported
      * proxy properties.
      *
@@ -202,12 +206,13 @@ local interface Communicator
      * @return The property set.
      *
      **/
-    ["cpp:const"] PropertyDict proxyToProperty(Object* proxy, string property);
+    ["cpp:const", "swift:noexcept"] PropertyDict proxyToProperty(["swift:nonnull"] Object* proxy, string property);
 
+#ifndef __SLICE2SWIFT__
     /**
      *
      * Convert a string into an identity. If the string does not parse
-     * correctly, the operation throws {@link IdentityParseException}.
+     * correctly, the operation throws IdentityParseException.
      *
      * @param str The string to convert into an identity.
      *
@@ -218,6 +223,7 @@ local interface Communicator
      **/
     ["cpp:const", "deprecate:stringToIdentity() is deprecated, use the static stringToIdentity() method instead."]
     Identity stringToIdentity(string str);
+#endif
 
     /**
      *
@@ -230,21 +236,20 @@ local interface Communicator
      * @see #stringToIdentity
      *
      **/
-    ["cpp:const"]
-    string identityToString(Identity ident);
+    ["cpp:const", "swift:noexcept"] string identityToString(Identity ident);
 
     /**
      *
-     * <p>Create a new object adapter. The endpoints for the object
-     * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.</p>
+     * Create a new object adapter. The endpoints for the object
+     * adapter are taken from the property <code><em>name</em>.Endpoints</code>.
      *
-     * <p>It is legal to create an object adapter with the empty string as
+     * It is legal to create an object adapter with the empty string as
      * its name. Such an object adapter is accessible via bidirectional
      * connections or by collocated invocations that originate from the
-     * same communicator as is used by the adapter.</p>
+     * same communicator as is used by the adapter.
      *
-     * <p>Attempts to create a named object adapter for which no configuration
-     * can be found raise {@link InitializationException}.
+     * Attempts to create a named object adapter for which no configuration
+     * can be found raise InitializationException.
      *
      * @param name The object adapter name.
      *
@@ -255,16 +260,16 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapter(string name);
+    ["js:async", "swift:nonnull"] ObjectAdapter createObjectAdapter(string name);
 
     /**
      *
-     * <p>Create a new object adapter with endpoints. This operation sets
-     * the property <tt><em>name</em>.Endpoints</tt>,
-     * and then calls {@link #createObjectAdapter}. It is provided as a
-     * convenience function.</p>
+     * Create a new object adapter with endpoints. This operation sets
+     * the property <code><em>name</em>.Endpoints</code>, and then calls
+     * {@link #createObjectAdapter}. It is provided as a convenience
+     * function.
      *
-     * <p>Calling this operation with an empty name will result in a
+     * Calling this operation with an empty name will result in a
      * UUID being generated for the name.
      *
      * @param name The object adapter name.
@@ -278,14 +283,14 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints);
+    ["js:async", "swift:nonnull"] ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints);
 
     /**
      *
-     * <p>Create a new object adapter with a router. This operation
-     * creates a routed object adapter.</p>
+     * Create a new object adapter with a router. This operation
+     * creates a routed object adapter.
      *
-     * <p>Calling this operation with an empty name will result in a
+     * Calling this operation with an empty name will result in a
      * UUID being generated for the name.
      *
      * @param name The object adapter name.
@@ -299,31 +304,32 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithRouter(string name, ["objc:param:router"] Router* rtr);
+    ["js:async", "swift:nonnull"] ObjectAdapter
+    createObjectAdapterWithRouter(string name, ["objc:param:router", "swift:nonnull"] Router* rtr);
 
+#if !defined(__SLICE2SWIFT__)
     /**
      *
-     * <p>Add an object factory to this communicator. Installing a
+     * Add an object factory to this communicator. Installing a
      * factory with an id for which a factory is already registered
-     * throws {@link AlreadyRegisteredException}.</p>
+     * throws AlreadyRegisteredException.
      *
-     * <p>When unmarshaling an Ice object, the Ice run time reads the
+     * When unmarshaling an Ice object, the Ice run time reads the
      * most-derived type id off the wire and attempts to create an
      * instance of the type using a factory. If no instance is created,
      * either because no factory was found, or because all factories
      * returned nil, the behavior of the Ice run time depends on the
-     * format with which the object was marshaled:</p>
+     * format with which the object was marshaled:
      *
-     * <p>If the object uses the "sliced" format, Ice ascends the class
+     * If the object uses the "sliced" format, Ice ascends the class
      * hierarchy until it finds a type that is recognized by a factory,
      * or it reaches the least-derived type. If no factory is found that
-     * can create an instance, the run time throws
-     * {@link NoValueFactoryException}.</p>
+     * can create an instance, the run time throws NoValueFactoryException.
      *
-     * <p>If the object uses the "compact" format, Ice immediately raises
-     * {@link NoValueFactoryException}.</p>
+     * If the object uses the "compact" format, Ice immediately raises
+     * NoValueFactoryException.
      *
-     * <p>The following order is used to locate a factory for a type:</p>
+     * The following order is used to locate a factory for a type:
      *
      * <ol>
      *
@@ -369,9 +375,11 @@ local interface Communicator
      * @see ValueFactoryManager#find
      *
      **/
-    ["cpp:const", "deprecate:findObjectFactory() is deprecated, use ValueFactoryManager::find() instead."]
+    ["cpp:const", "cpp:noexcept", "deprecate:findObjectFactory() is deprecated, use ValueFactoryManager::find() instead."]
     ObjectFactory findObjectFactory(string id);
 
+#endif
+
     /**
      * Get the implicit context associated with this communicator.
      *
@@ -380,7 +388,8 @@ local interface Communicator
      * or is set to None.
      *
      **/
-    ["cpp:const"] ImplicitContext getImplicitContext();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"]
+    ImplicitContext getImplicitContext();
 
     /**
      *
@@ -391,7 +400,7 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ["cpp:const"] Properties getProperties();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Properties getProperties();
 
     /**
      *
@@ -402,8 +411,9 @@ local interface Communicator
      * @see Logger
      *
      **/
-    ["cpp:const"] Logger getLogger();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"] Logger getLogger();
 
+#if !defined(__SLICE2SWIFT__) && !defined(__SLICE2JS__)
     /**
      *
      * Get the observer resolver object for this communicator.
@@ -411,7 +421,8 @@ local interface Communicator
      * @return This communicator's observer resolver object.
      *
      **/
-    ["cpp:const"] Ice::Instrumentation::CommunicatorObserver getObserver();
+    ["cpp:const", "cpp:noexcept"] Instrumentation::CommunicatorObserver getObserver();
+#endif
 
     /**
      *
@@ -423,17 +434,17 @@ local interface Communicator
      * @see Router
      *
      **/
-    ["cpp:const"] Router* getDefaultRouter();
+    ["cpp:const", "swift:noexcept"] Router* getDefaultRouter();
 
     /**
      *
-     * <p>Set a default router for this communicator. All newly
+     * Set a default router for this communicator. All newly
      * created proxies will use this default router. To disable the
      * default router, null can be used. Note that this
-     * operation has no effect on existing proxies.</p>
+     * operation has no effect on existing proxies.
      *
-     * <p class="Note">You can also set a router for an individual proxy
-     * by calling the operation <tt>ice_router</tt> on the proxy.
+     * You can also set a router for an individual proxy
+     * by calling the operation <code>ice_router</code> on the proxy.
      *
      * @param rtr The default router to use for this communicator.
      *
@@ -442,7 +453,7 @@ local interface Communicator
      * @see Router
      *
      **/
-    void setDefaultRouter(Router* rtr);
+    ["swift:noexcept"] void setDefaultRouter(Router* rtr);
 
     /**
      *
@@ -454,20 +465,19 @@ local interface Communicator
      * @see Locator
      *
      **/
-    ["cpp:const"] Locator* getDefaultLocator();
+    ["cpp:const", "swift:noexcept"] Locator* getDefaultLocator();
 
     /**
      *
-     * <p>Set a default Ice locator for this communicator. All newly
+     * Set a default Ice locator for this communicator. All newly
      * created proxy and object adapters will use this default
      * locator. To disable the default locator, null can be used.
      * Note that this operation has no effect on existing proxies or
-     * object adapters.</p>
+     * object adapters.
      *
-     * <p class="Note"> You can also set a locator for an individual proxy
-     * by calling the operation <tt>ice_locator</tt> on the proxy, or for an
-     * object adapter by calling the operation {@link ObjectAdapter#setLocator}
-     * on the object adapter.
+     * You can also set a locator for an individual proxy by calling the
+     * operation <code>ice_locator</code> on the proxy, or for an object adapter
+     * by calling {@link ObjectAdapter#setLocator} on the object adapter.
      *
      * @param loc The default locator to use for this communicator.
      *
@@ -476,8 +486,9 @@ local interface Communicator
      * @see ObjectAdapter#setLocator
      *
      **/
-    void setDefaultLocator(Locator* loc);
+    ["swift:noexcept"] void setDefaultLocator(Locator* loc);
 
+#if !defined(__SLICE2SWIFT__) && !defined(__SLICE2JS__)
     /**
      *
      * Get the plug-in manager for this communicator.
@@ -488,6 +499,7 @@ local interface Communicator
      *
      **/
     ["cpp:const"] PluginManager getPluginManager();
+#endif
 
     /**
      *
@@ -498,7 +510,8 @@ local interface Communicator
      * @see ValueFactoryManager
      *
      **/
-    ["cpp:const"] ValueFactoryManager getValueFactoryManager();
+    ["cpp:const", "cpp:noexcept", "swift:noexcept", "swift:nonnull"]
+    ValueFactoryManager getValueFactoryManager();
 
     /**
      *
@@ -513,13 +526,14 @@ local interface Communicator
      **/
     ["async-oneway"] void flushBatchRequests(CompressBatch compress);
 
+#ifndef __SLICE2JS__
     /**
      *
      * Add the Admin object with all its facets to the provided object adapter.
      * If Ice.Admin.ServerId is set and the provided object adapter has a {@link Locator},
      * createAdmin registers the Admin's Process facet with the {@link Locator}'s {@link LocatorRegistry}.
      *
-     * <p>createAdmin call only be called once; subsequent calls raise {@link InitializationException}.</p>
+     * createAdmin must only be called once; subsequent calls raise InitializationException.
      *
      * @param adminAdapter The object adapter used to host the Admin object; if null and
      * Ice.Admin.Endpoints is set, create, activate and use the Ice.Admin object adapter.
@@ -531,7 +545,7 @@ local interface Communicator
      * @see #getAdmin
      *
      **/
-    Object* createAdmin(ObjectAdapter adminAdapter, Identity adminId);
+    ["swift:nonnull"] Object* createAdmin(ObjectAdapter adminAdapter, Identity adminId);
 
     /**
      *
@@ -542,9 +556,9 @@ local interface Communicator
      * object created by getAdmin is {value of Ice.Admin.InstanceName}/admin, or {UUID}/admin
      * when Ice.Admin.InstanceName is not set.
      *
-     * <p>If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
-     * initialization, after initialization of all plugins.</p>
-
+     * If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
+     * initialization, after initialization of all plugins.
+     *
      * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no
      * Admin object is configured.
      *
@@ -556,25 +570,25 @@ local interface Communicator
      *
      * Add a new facet to the Admin object.
      * Adding a servant with a facet that is already registered
-     * throws {@link AlreadyRegisteredException}.
+     * throws AlreadyRegisteredException.
      *
      * @param servant The servant that implements the new Admin facet.
      * @param facet The name of the new Admin facet.
      *
      **/
-    void addAdminFacet(Object servant, string facet);
+    void addAdminFacet(["swift:nonnull"] Object servant, string facet);
 
     /**
      *
      * Remove the following facet to the Admin object.
      * Removing a facet that was not previously registered throws
-     * {@link NotRegisteredException}.
+     * NotRegisteredException.
      *
      * @param facet The name of the Admin facet.
      * @return The servant associated with this Admin facet.
      *
      **/
-    Object removeAdminFacet(string facet);
+    ["swift:nonnull", "swift:attribute:@discardableResult"] Object removeAdminFacet(string facet);
 
     /**
      *
@@ -585,7 +599,7 @@ local interface Communicator
      * null if no facet is registered with the given name.
      *
      **/
-    Object findAdminFacet(string facet);
+    ["swift:noexcept"] Object findAdminFacet(string facet);
 
     /**
      *
@@ -597,9 +611,36 @@ local interface Communicator
      * @see #findAdminFacet
      *
      **/
-    FacetMap findAllAdminFacets();
+    ["swift:noexcept"] FacetMap findAllAdminFacets();
+#endif
+
+#if defined(__SLICE2SWIFT__) || defined(ICE_SWIFT)
+    /**
+     *
+     * Returns the client dispatch queue.
+     *
+     * @return The dispatch queue associated wih this Communicator's
+     * client thread pool.
+     *
+     **/
+    ["cpp:const", "swift:nonnull", "cpp:type:dispatch_queue_t", "swift:type:Dispatch.DispatchQueue"]
+    LocalObject getClientDispatchQueue();
+
+    /**
+     *
+     * Returns the server dispatch queue.
+     *
+     * @return The dispatch queue associated wih the Communicator's
+     * server thread pool.
+     *
+     **/
+    ["cpp:const", "swift:nonnull", "cpp:type:dispatch_queue_t", "swift:type:Dispatch.DispatchQueue"]
+    LocalObject getServerDispatchQueue();
+#endif
 }
 
+#endif
+
 /**
  * The output mode for xxxToString method such as identityToString and proxyToString.
  * The actual encoding format for the string is the same for all modes: you