IcePack

author: Marc Laukien <marc@zeroc.com> 2001-08-14 21:00:02 +0000
committer: Marc Laukien <marc@zeroc.com> 2001-08-14 21:00:02 +0000
commit: b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598 (patch)
tree: 9a117cb3adc3f755026346c939853719aeb5cecd /cpp
parent: changed directory structure (diff)
download: ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.tar.bz2
ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.tar.xz
ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.zip
27 files changed, 552 insertions, 393 deletions
diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile
index e0c623828eb..04db8962077 100644
--- a/cpp/doc/Makefile
+++ b/cpp/doc/Makefile
@@ -15,16 +15,19 @@ TARGETS		= manual/index.html \
 
 SGMLFILES	= manual.sgml \
 		  ModuleIce.sgml \
+		  ModuleIcePack.sgml \
 		  Properties.sgml \
 		  ReferencesEndpoints.sgml
 
-SLICEFILES	= ../slice/Ice/Communicator.ice \
+ICEFILES	= ../slice/Ice/Communicator.ice \
 		  ../slice/Ice/Logger.ice \
 		  ../slice/Ice/ObjectAdapter.ice \
 		  ../slice/Ice/Pickler.ice \
 		  ../slice/Ice/Properties.ice \
 		  ../slice/Ice/ValueFactory.ice
 
+ICEPACKFILES	= ../slice/IcePack/Admin.ice
+
 include $(top_srcdir)/config/Make.rules
 
 manual/index.html: $(SGMLFILES)
@@ -41,9 +44,13 @@ manual.pdf: $(SGMLFILES)
 clean::
 	rm -rf manual manual.out manual.texi
 
-ModuleIce.sgml: $(SLICEFILES) $(SLICE2DOCBOOK)
+ModuleIce.sgml: $(ICEFILES) $(SLICE2DOCBOOK)
+	rm -f $@
+	$(SLICE2DOCBOOK) --no-globals -I$(top_srcdir)/slice $@ $(ICEFILES)
+
+ModuleIcePack.sgml: $(ICEPACKFILES) $(SLICE2DOCBOOK)
 	rm -f $@
-	$(SLICE2DOCBOOK) --no-globals -I$(top_srcdir)/slice $@ $(SLICEFILES)
+	$(SLICE2DOCBOOK) --no-globals -I$(top_srcdir)/slice $@ $(ICEPACKFILES)
 
 clean::
 	rm -f ModuleIce.sgml
diff --git a/cpp/doc/ModuleIce.sgml b/cpp/doc/ModuleIce.sgml
index 2c07e12167b..8bc7f9adfd7 100644
--- a/cpp/doc/ModuleIce.sgml
+++ b/cpp/doc/ModuleIce.sgml
@@ -10,7 +10,7 @@ Generated by the `slice2docbook' converter
 **********************************************************************
 -->
 <!-- Ice version 0.0.1 -->
-<section id="slice2docbook.1">
+<section id="ModuleIce.sgml.1">
     <title>
 	Ice
     </title>
@@ -28,7 +28,7 @@ Generated by the `slice2docbook' converter
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.2"><type>Communicator</type></link>
+			<link linkend="ModuleIce.sgml.2"><type>Communicator</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -38,7 +38,7 @@ The central Ice object.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.3"><type>Logger</type></link>
+			<link linkend="ModuleIce.sgml.3"><type>Logger</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -47,7 +47,7 @@ The central Ice object.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.4"><type>ObjectAdapter</type></link>
+			<link linkend="ModuleIce.sgml.4"><type>ObjectAdapter</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -59,7 +59,7 @@ Proxies.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.5"><type>ObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.5"><type>ObjectLocator</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -70,7 +70,7 @@ objects, which it doesn't find in its Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.6"><type>Pickler</type></link>
+			<link linkend="ModuleIce.sgml.6"><type>Pickler</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -79,7 +79,7 @@ objects, which it doesn't find in its Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.7"><type>Properties</type></link>
+			<link linkend="ModuleIce.sgml.7"><type>Properties</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -88,7 +88,7 @@ objects, which it doesn't find in its Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.8"><type>ValueFactory</type></link>
+			<link linkend="ModuleIce.sgml.8"><type>ValueFactory</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -104,7 +104,7 @@ objects, which it doesn't find in its Active Object Map.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.9"><type>InputStream</type></link>
+			<link linkend="ModuleIce.sgml.9"><type>InputStream</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -113,7 +113,7 @@ objects, which it doesn't find in its Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.10"><type>OutputStream</type></link>
+			<link linkend="ModuleIce.sgml.10"><type>OutputStream</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -123,7 +123,7 @@ objects, which it doesn't find in its Active Object Map.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.9">
+    <section id="ModuleIce.sgml.9">
 	<title>
 	    InputStream
 	</title>
@@ -131,7 +131,7 @@ objects, which it doesn't find in its Active Object Map.
 	<para>
 	</para>
     </section>
-    <section id="slice2docbook.10">
+    <section id="ModuleIce.sgml.10">
 	<title>
 	    OutputStream
 	</title>
@@ -140,7 +140,7 @@ objects, which it doesn't find in its Active Object Map.
 	</para>
     </section>
 </section>
-<section id="slice2docbook.2">
+<section id="ModuleIce.sgml.2">
     <title>
 	Ice::Communicator
     </title>
@@ -161,19 +161,19 @@ language specific, and not specified in Slice code.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.3"><classname>Logger</classname></link>
+			<link linkend="ModuleIce.sgml.3"><classname>Logger</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.6"><classname>Pickler</classname></link>
+			<link linkend="ModuleIce.sgml.6"><classname>Pickler</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.7"><classname>Properties</classname></link>
+			<link linkend="ModuleIce.sgml.7"><classname>Properties</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.8"><classname>ValueFactory</classname></link>
+			<link linkend="ModuleIce.sgml.8"><classname>ValueFactory</classname></link>
 		    </member>
 		</simplelist>
 	    </para>
@@ -185,7 +185,7 @@ language specific, and not specified in Slice code.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.11"><type>createObjectAdapter</type></link>
+			<link linkend="ModuleIce.sgml.11"><type>createObjectAdapter</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -195,7 +195,7 @@ Create a new object adapter.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.12"><type>createObjectAdapterWithEndpoints</type></link>
+			<link linkend="ModuleIce.sgml.12"><type>createObjectAdapterWithEndpoints</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -205,7 +205,7 @@ Create a new object adapter with a list of endpoints.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.13"><type>destroy</type></link>
+			<link linkend="ModuleIce.sgml.13"><type>destroy</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -215,7 +215,7 @@ Destroy the Communicator.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.14"><type>getLogger</type></link>
+			<link linkend="ModuleIce.sgml.14"><type>getLogger</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -225,7 +225,7 @@ Get the Logger for this Communicator.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.15"><type>getPickler</type></link>
+			<link linkend="ModuleIce.sgml.15"><type>getPickler</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -235,7 +235,7 @@ Get the Pickler for this Communicator.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.16"><type>getProperties</type></link>
+			<link linkend="ModuleIce.sgml.16"><type>getProperties</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -245,7 +245,7 @@ Get the Properties for this Communicator.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.17"><type>installValueFactory</type></link>
+			<link linkend="ModuleIce.sgml.17"><type>installValueFactory</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -255,7 +255,7 @@ Install a new Value Factory.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.18"><type>setLogger</type></link>
+			<link linkend="ModuleIce.sgml.18"><type>setLogger</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -265,7 +265,7 @@ Set the Logger for this Communicator.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.19"><type>shutdown</type></link>
+			<link linkend="ModuleIce.sgml.19"><type>shutdown</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -276,7 +276,7 @@ application.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.20"><type>stringToProxy</type></link>
+			<link linkend="ModuleIce.sgml.20"><type>stringToProxy</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -286,7 +286,7 @@ Convert a string into a Proxy.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.21"><type>waitForShutdown</type></link>
+			<link linkend="ModuleIce.sgml.21"><type>waitForShutdown</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -298,11 +298,11 @@ down.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.11">
+    <section id="ModuleIce.sgml.11">
 	<title>
 	    createObjectAdapter
 	</title>
-<synopsis><link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link> <function>createObjectAdapter</function>(
+<synopsis><link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link> <function>createObjectAdapter</function>(
     <type>string</type> <parameter>name</parameter>);</synopsis>
 	<para>
 Create a new object adapter. The endpoints for the object
@@ -346,20 +346,20 @@ must be unique for the Communicator.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.12"><type>createObjectAdapterWithEndpoints</type></link>
+			<link linkend="ModuleIce.sgml.12"><type>createObjectAdapterWithEndpoints</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.12">
+    <section id="ModuleIce.sgml.12">
 	<title>
 	    createObjectAdapterWithEndpoints
 	</title>
-<synopsis><link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link> <function>createObjectAdapterWithEndpoints</function>(
+<synopsis><link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link> <function>createObjectAdapterWithEndpoints</function>(
     <type>string</type> <parameter>name</parameter>,
     <type>string</type> <parameter>endpts</parameter>);</synopsis>
 	<para>
@@ -414,16 +414,16 @@ must be unique for the Communicator.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.11"><type>createObjectAdapter</type></link>
+			<link linkend="ModuleIce.sgml.11"><type>createObjectAdapter</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.13">
+    <section id="ModuleIce.sgml.13">
 	<title>
 	    destroy
 	</title>
@@ -443,17 +443,17 @@ shuts down the client-side of an application.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.19"><type>shutdown</type></link>
+			<link linkend="ModuleIce.sgml.19"><type>shutdown</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.14">
+    <section id="ModuleIce.sgml.14">
 	<title>
 	    getLogger
 	</title>
-<synopsis><link linkend="slice2docbook.3"><classname>Logger</classname></link> <function>getLogger</function>();</synopsis>
+<synopsis><link linkend="ModuleIce.sgml.3"><classname>Logger</classname></link> <function>getLogger</function>();</synopsis>
 	<para>
 Get the Logger for this Communicator.
 	</para>
@@ -466,11 +466,11 @@ Get the Logger for this Communicator.
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.15">
+    <section id="ModuleIce.sgml.15">
 	<title>
 	    getPickler
 	</title>
-<synopsis><link linkend="slice2docbook.6"><classname>Pickler</classname></link> <function>getPickler</function>();</synopsis>
+<synopsis><link linkend="ModuleIce.sgml.6"><classname>Pickler</classname></link> <function>getPickler</function>();</synopsis>
 	<para>
 Get the Pickler for this Communicator.
 	</para>
@@ -483,11 +483,11 @@ Get the Pickler for this Communicator.
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.16">
+    <section id="ModuleIce.sgml.16">
 	<title>
 	    getProperties
 	</title>
-<synopsis><link linkend="slice2docbook.7"><classname>Properties</classname></link> <function>getProperties</function>();</synopsis>
+<synopsis><link linkend="ModuleIce.sgml.7"><classname>Properties</classname></link> <function>getProperties</function>();</synopsis>
 	<para>
 Get the Properties for this Communicator.
 	</para>
@@ -500,12 +500,12 @@ Get the Properties for this Communicator.
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.17">
+    <section id="ModuleIce.sgml.17">
 	<title>
 	    installValueFactory
 	</title>
 <synopsis><type>void</type> <function>installValueFactory</function>(
-    <link linkend="slice2docbook.8"><classname>ValueFactory</classname></link> <parameter>factory</parameter>,
+    <link linkend="ModuleIce.sgml.8"><classname>ValueFactory</classname></link> <parameter>factory</parameter>,
     <type>string</type> <parameter>id</parameter>);</synopsis>
 	<para>
 Install a new Value Factory.
@@ -542,12 +542,12 @@ Install a new Value Factory.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.18">
+    <section id="ModuleIce.sgml.18">
 	<title>
 	    setLogger
 	</title>
 <synopsis><type>void</type> <function>setLogger</function>(
-    <link linkend="slice2docbook.3"><classname>Logger</classname></link> <parameter>logger</parameter>);</synopsis>
+    <link linkend="ModuleIce.sgml.3"><classname>Logger</classname></link> <parameter>logger</parameter>);</synopsis>
 	<para>
 Set the Logger for this Communicator.
 	</para>
@@ -571,7 +571,7 @@ Set the Logger for this Communicator.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.19">
+    <section id="ModuleIce.sgml.19">
 	<title>
 	    shutdown
 	</title>
@@ -595,16 +595,16 @@ complete. </para></note>
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.13"><type>destroy</type></link>
+			<link linkend="ModuleIce.sgml.13"><type>destroy</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.21"><type>waitForShutdown</type></link>
+			<link linkend="ModuleIce.sgml.21"><type>waitForShutdown</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.20">
+    <section id="ModuleIce.sgml.20">
 	<title>
 	    stringToProxy
 	</title>
@@ -644,7 +644,7 @@ host "some_host", port 10000.
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.21">
+    <section id="ModuleIce.sgml.21">
 	<title>
 	    waitForShutdown
 	</title>
@@ -667,17 +667,17 @@ then exits the application.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.19"><type>shutdown</type></link>
+			<link linkend="ModuleIce.sgml.19"><type>shutdown</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.13"><type>destroy</type></link>
+			<link linkend="ModuleIce.sgml.13"><type>destroy</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
 </section>
-<section id="slice2docbook.3">
+<section id="ModuleIce.sgml.3">
     <title>
 	Ice::Logger
     </title>
@@ -695,7 +695,7 @@ then exits the application.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.22"><type>error</type></link>
+			<link linkend="ModuleIce.sgml.22"><type>error</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -704,7 +704,7 @@ then exits the application.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.23"><type>trace</type></link>
+			<link linkend="ModuleIce.sgml.23"><type>trace</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -713,7 +713,7 @@ then exits the application.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.24"><type>warning</type></link>
+			<link linkend="ModuleIce.sgml.24"><type>warning</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -723,7 +723,7 @@ then exits the application.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.22">
+    <section id="ModuleIce.sgml.22">
 	<title>
 	    error
 	</title>
@@ -732,7 +732,7 @@ then exits the application.
 	<para>
 	</para>
     </section>
-    <section id="slice2docbook.23">
+    <section id="ModuleIce.sgml.23">
 	<title>
 	    trace
 	</title>
@@ -742,7 +742,7 @@ then exits the application.
 	<para>
 	</para>
     </section>
-    <section id="slice2docbook.24">
+    <section id="ModuleIce.sgml.24">
 	<title>
 	    warning
 	</title>
@@ -752,7 +752,7 @@ then exits the application.
 	</para>
     </section>
 </section>
-<section id="slice2docbook.4">
+<section id="ModuleIce.sgml.4">
     <title>
 	Ice::ObjectAdapter
     </title>
@@ -775,10 +775,10 @@ Proxies. Object Adapters are created with the Communicator's
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.2"><classname>Communicator</classname></link>
+			<link linkend="ModuleIce.sgml.2"><classname>Communicator</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.5"><classname>ObjectLocator</classname></link>
+			<link linkend="ModuleIce.sgml.5"><classname>ObjectLocator</classname></link>
 		    </member>
 		</simplelist>
 	    </para>
@@ -790,7 +790,7 @@ Proxies. Object Adapters are created with the Communicator's
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.25"><type>activate</type></link>
+			<link linkend="ModuleIce.sgml.25"><type>activate</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -801,7 +801,7 @@ Adapter.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.26"><type>add</type></link>
+			<link linkend="ModuleIce.sgml.26"><type>add</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -811,7 +811,7 @@ Add a new Object to this Object Adapter's Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.27"><type>addTemporary</type></link>
+			<link linkend="ModuleIce.sgml.27"><type>addTemporary</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -822,7 +822,7 @@ Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.28"><type>deactivate</type></link>
+			<link linkend="ModuleIce.sgml.28"><type>deactivate</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -833,7 +833,7 @@ Adapter.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.29"><type>getCommunicator</type></link>
+			<link linkend="ModuleIce.sgml.29"><type>getCommunicator</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -843,7 +843,7 @@ Get the Communicator this Object Adapter belongs to.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.30"><type>getName</type></link>
+			<link linkend="ModuleIce.sgml.30"><type>getName</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -853,7 +853,7 @@ Get the name of this Object Adapter.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.31"><type>getObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.31"><type>getObjectLocator</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -863,7 +863,7 @@ Get the Object Locator for this Object Adapter.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.32"><type>hold</type></link>
+			<link linkend="ModuleIce.sgml.32"><type>hold</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -873,7 +873,7 @@ Temporarily hold receiving and dispatching requests.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.33"><type>identityToObject</type></link>
+			<link linkend="ModuleIce.sgml.33"><type>identityToObject</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -884,7 +884,7 @@ its identity.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.34"><type>identityToProxy</type></link>
+			<link linkend="ModuleIce.sgml.34"><type>identityToProxy</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -895,7 +895,7 @@ identity.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.35"><type>objectToIdentity</type></link>
+			<link linkend="ModuleIce.sgml.35"><type>objectToIdentity</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -906,7 +906,7 @@ Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.36"><type>objectToProxy</type></link>
+			<link linkend="ModuleIce.sgml.36"><type>objectToProxy</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -917,7 +917,7 @@ Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.37"><type>proxyToIdentity</type></link>
+			<link linkend="ModuleIce.sgml.37"><type>proxyToIdentity</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -927,7 +927,7 @@ Extract the identity from a Proxy.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.38"><type>proxyToObject</type></link>
+			<link linkend="ModuleIce.sgml.38"><type>proxyToObject</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -938,7 +938,7 @@ given a Proxy.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.39"><type>remove</type></link>
+			<link linkend="ModuleIce.sgml.39"><type>remove</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -948,7 +948,7 @@ Remove an Object from the Object Adapter's Active Object Map.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.40"><type>setObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.40"><type>setObjectLocator</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -959,7 +959,7 @@ Set an Object Locator for this Object Adapter.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.25">
+    <section id="ModuleIce.sgml.25">
 	<title>
 	    activate
 	</title>
@@ -976,16 +976,16 @@ requests received through its Endpoints.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.32"><type>hold</type></link>
+			<link linkend="ModuleIce.sgml.32"><type>hold</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.28"><type>deactivate</type></link>
+			<link linkend="ModuleIce.sgml.28"><type>deactivate</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.26">
+    <section id="ModuleIce.sgml.26">
 	<title>
 	    add
 	</title>
@@ -1033,16 +1033,16 @@ Add a new Object to this Object Adapter's Active Object Map.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.27"><type>addTemporary</type></link>
+			<link linkend="ModuleIce.sgml.27"><type>addTemporary</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.39"><type>remove</type></link>
+			<link linkend="ModuleIce.sgml.39"><type>remove</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.27">
+    <section id="ModuleIce.sgml.27">
 	<title>
 	    addTemporary
 	</title>
@@ -1094,16 +1094,16 @@ removed with <literal>remove</literal>.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.27"><type>addTemporary</type></link>
+			<link linkend="ModuleIce.sgml.27"><type>addTemporary</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.39"><type>remove</type></link>
+			<link linkend="ModuleIce.sgml.39"><type>remove</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.28">
+    <section id="ModuleIce.sgml.28">
 	<title>
 	    deactivate
 	</title>
@@ -1124,20 +1124,20 @@ deactivation is permanent and <literal>activate</literal> or
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.25"><type>activate</type></link>
+			<link linkend="ModuleIce.sgml.25"><type>activate</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.32"><type>hold</type></link>
+			<link linkend="ModuleIce.sgml.32"><type>hold</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.29">
+    <section id="ModuleIce.sgml.29">
 	<title>
 	    getCommunicator
 	</title>
-<synopsis><link linkend="slice2docbook.2"><classname>Communicator</classname></link> <function>getCommunicator</function>();</synopsis>
+<synopsis><link linkend="ModuleIce.sgml.2"><classname>Communicator</classname></link> <function>getCommunicator</function>();</synopsis>
 	<para>
 Get the Communicator this Object Adapter belongs to.
 	</para>
@@ -1156,13 +1156,13 @@ Get the Communicator this Object Adapter belongs to.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.2"><classname>Communicator</classname></link>
+			<link linkend="ModuleIce.sgml.2"><classname>Communicator</classname></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.30">
+    <section id="ModuleIce.sgml.30">
 	<title>
 	    getName
 	</title>
@@ -1186,17 +1186,17 @@ for configuration purposes with Properties.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.7"><classname>Properties</classname></link>
+			<link linkend="ModuleIce.sgml.7"><classname>Properties</classname></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.31">
+    <section id="ModuleIce.sgml.31">
 	<title>
 	    getObjectLocator
 	</title>
-<synopsis><link linkend="slice2docbook.5"><classname>ObjectLocator</classname></link> <function>getObjectLocator</function>();</synopsis>
+<synopsis><link linkend="ModuleIce.sgml.5"><classname>ObjectLocator</classname></link> <function>getObjectLocator</function>();</synopsis>
 	<para>
 Get the Object Locator for this Object Adapter.
 	</para>
@@ -1216,16 +1216,16 @@ set, null is returned.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.5"><classname>ObjectLocator</classname></link>
+			<link linkend="ModuleIce.sgml.5"><classname>ObjectLocator</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.40"><type>setObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.40"><type>setObjectLocator</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.32">
+    <section id="ModuleIce.sgml.32">
 	<title>
 	    hold
 	</title>
@@ -1242,16 +1242,16 @@ operation.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.25"><type>activate</type></link>
+			<link linkend="ModuleIce.sgml.25"><type>activate</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.28"><type>deactivate</type></link>
+			<link linkend="ModuleIce.sgml.28"><type>deactivate</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.33">
+    <section id="ModuleIce.sgml.33">
 	<title>
 	    identityToObject
 	</title>
@@ -1292,7 +1292,7 @@ see objectToIdentity
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.34">
+    <section id="ModuleIce.sgml.34">
 	<title>
 	    identityToProxy
 	</title>
@@ -1333,7 +1333,7 @@ see proxyToIdentity
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.35">
+    <section id="ModuleIce.sgml.35">
 	<title>
 	    objectToIdentity
 	</title>
@@ -1374,7 +1374,7 @@ see identityToProxy
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.36">
+    <section id="ModuleIce.sgml.36">
 	<title>
 	    objectToProxy
 	</title>
@@ -1414,7 +1414,7 @@ see objectToIdentity
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.37">
+    <section id="ModuleIce.sgml.37">
 	<title>
 	    proxyToIdentity
 	</title>
@@ -1453,7 +1453,7 @@ see identityToProxy
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.38">
+    <section id="ModuleIce.sgml.38">
 	<title>
 	    proxyToObject
 	</title>
@@ -1493,7 +1493,7 @@ see identityToObject
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.39">
+    <section id="ModuleIce.sgml.39">
 	<title>
 	    remove
 	</title>
@@ -1528,21 +1528,21 @@ Remove an Object from the Object Adapter's Active Object Map.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.26"><type>add</type></link>
+			<link linkend="ModuleIce.sgml.26"><type>add</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.27"><type>addTemporary</type></link>
+			<link linkend="ModuleIce.sgml.27"><type>addTemporary</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.40">
+    <section id="ModuleIce.sgml.40">
 	<title>
 	    setObjectLocator
 	</title>
 <synopsis><type>void</type> <function>setObjectLocator</function>(
-    <link linkend="slice2docbook.5"><classname>ObjectLocator</classname></link> <parameter>locator</parameter>);</synopsis>
+    <link linkend="ModuleIce.sgml.5"><classname>ObjectLocator</classname></link> <parameter>locator</parameter>);</synopsis>
 	<para>
 Set an Object Locator for this Object Adapter.
 	</para>
@@ -1572,17 +1572,17 @@ Set an Object Locator for this Object Adapter.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.5"><classname>ObjectLocator</classname></link>
+			<link linkend="ModuleIce.sgml.5"><classname>ObjectLocator</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.31"><type>getObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.31"><type>getObjectLocator</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
 </section>
-<section id="slice2docbook.5">
+<section id="ModuleIce.sgml.5">
     <title>
 	Ice::ObjectLocator
     </title>
@@ -1604,13 +1604,13 @@ locator must be set with the Object Adapter's
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.40"><type>ObjectAdapter::setObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.40"><type>ObjectAdapter::setObjectLocator</type></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.31"><type>ObjectAdapter::getObjectLocator</type></link>
+			<link linkend="ModuleIce.sgml.31"><type>ObjectAdapter::getObjectLocator</type></link>
 		    </member>
 		</simplelist>
 	    </para>
@@ -1622,7 +1622,7 @@ locator must be set with the Object Adapter's
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.41"><type>finished</type></link>
+			<link linkend="ModuleIce.sgml.41"><type>finished</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1633,7 +1633,7 @@ Called by the Object Adapter after a request, provided that
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.42"><type>locate</type></link>
+			<link linkend="ModuleIce.sgml.42"><type>locate</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1645,12 +1645,12 @@ cannot be found in the Object Adapter's Active Object Map.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.41">
+    <section id="ModuleIce.sgml.41">
 	<title>
 	    finished
 	</title>
 <synopsis><type>void</type> <function>finished</function>(
-    <link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link> <parameter>adapter</parameter>,
+    <link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link> <parameter>adapter</parameter>,
     <type>string</type> <parameter>identity</parameter>,
     <type>Object</type> <parameter>object</parameter>,
     <type>Object</type> <parameter>cookie</parameter>);</synopsis>
@@ -1724,21 +1724,21 @@ can be used for cleanup after a request.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.42"><type>locate</type></link>
+			<link linkend="ModuleIce.sgml.42"><type>locate</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
-    <section id="slice2docbook.42">
+    <section id="ModuleIce.sgml.42">
 	<title>
 	    locate
 	</title>
 <synopsis><type>Object</type> <function>locate</function>(
-    <link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link> <parameter>adapter</parameter>,
+    <link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link> <parameter>adapter</parameter>,
     <type>string</type> <parameter>identity</parameter>;
     <type>Object</type> <parameter>cookie</parameter>);</synopsis>
 	<para>
@@ -1808,17 +1808,17 @@ found.
 	    <para>
 		<simplelist type="inline">
 		    <member>
-			<link linkend="slice2docbook.4"><classname>ObjectAdapter</classname></link>
+			<link linkend="ModuleIce.sgml.4"><classname>ObjectAdapter</classname></link>
 		    </member>
 		    <member>
-			<link linkend="slice2docbook.41"><type>finished</type></link>
+			<link linkend="ModuleIce.sgml.41"><type>finished</type></link>
 		    </member>
 		</simplelist>
 	    </para>
 	</section>
     </section>
 </section>
-<section id="slice2docbook.6">
+<section id="ModuleIce.sgml.6">
     <title>
 	Ice::Pickler
     </title>
@@ -1836,7 +1836,7 @@ found.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.43"><type>pickle</type></link>
+			<link linkend="ModuleIce.sgml.43"><type>pickle</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1845,7 +1845,7 @@ found.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.44"><type>unpickle</type></link>
+			<link linkend="ModuleIce.sgml.44"><type>unpickle</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1855,27 +1855,27 @@ found.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.43">
+    <section id="ModuleIce.sgml.43">
 	<title>
 	    pickle
 	</title>
 <synopsis><type>void</type> <function>pickle</function>(
     <type>Object</type> <parameter>object</parameter>,
-    <link linkend="slice2docbook.10"><type>OutputStream</type></link> <parameter>out</parameter>);</synopsis>
+    <link linkend="ModuleIce.sgml.10"><type>OutputStream</type></link> <parameter>out</parameter>);</synopsis>
 	<para>
 	</para>
     </section>
-    <section id="slice2docbook.44">
+    <section id="ModuleIce.sgml.44">
 	<title>
 	    unpickle
 	</title>
 <synopsis><type>Object</type> <function>unpickle</function>(
-    <link linkend="slice2docbook.9"><type>InputStream</type></link> <parameter>in</parameter>);</synopsis>
+    <link linkend="ModuleIce.sgml.9"><type>InputStream</type></link> <parameter>in</parameter>);</synopsis>
 	<para>
 	</para>
     </section>
 </section>
-<section id="slice2docbook.7">
+<section id="ModuleIce.sgml.7">
     <title>
 	Ice::Properties
     </title>
@@ -1893,7 +1893,7 @@ found.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.45"><type>getProperty</type></link>
+			<link linkend="ModuleIce.sgml.45"><type>getProperty</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1902,7 +1902,7 @@ found.
 		</varlistentry>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.46"><type>setProperty</type></link>
+			<link linkend="ModuleIce.sgml.46"><type>setProperty</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1912,7 +1912,7 @@ found.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.45">
+    <section id="ModuleIce.sgml.45">
 	<title>
 	    getProperty
 	</title>
@@ -1921,7 +1921,7 @@ found.
 	<para>
 	</para>
     </section>
-    <section id="slice2docbook.46">
+    <section id="ModuleIce.sgml.46">
 	<title>
 	    setProperty
 	</title>
@@ -1932,7 +1932,7 @@ found.
 	</para>
     </section>
 </section>
-<section id="slice2docbook.8">
+<section id="ModuleIce.sgml.8">
     <title>
 	Ice::ValueFactory
     </title>
@@ -1950,7 +1950,7 @@ found.
 	    <variablelist>
 		<varlistentry>
 		    <term>
-			<link linkend="slice2docbook.47"><type>create</type></link>
+			<link linkend="ModuleIce.sgml.47"><type>create</type></link>
 		    </term>
 		    <listitem>
 			<para>
@@ -1960,7 +1960,7 @@ found.
 	    </variablelist>
 	</section>
     </section>
-    <section id="slice2docbook.47">
+    <section id="ModuleIce.sgml.47">
 	<title>
 	    create
 	</title>
diff --git a/cpp/doc/manual.sgml b/cpp/doc/manual.sgml
index 2179ca0625c..1c989567133 100644
--- a/cpp/doc/manual.sgml
+++ b/cpp/doc/manual.sgml
@@ -1,6 +1,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!ENTITY Ice "<phrase>Ice</phrase>">
 <!ENTITY ModuleIce SYSTEM "ModuleIce.sgml">
+<!ENTITY ModuleIcePack SYSTEM "ModuleIcePack.sgml">
 <!ENTITY Properties SYSTEM "Properties.sgml">
 <!ENTITY ReferencesEndpoints SYSTEM "ReferencesEndpoints.sgml">
 ]>
@@ -57,6 +58,10 @@ TBD
 &ModuleIce;
 </chapter>
 <chapter>
+<title>Module IcePack</title>
+&ModuleIcePack;
+</chapter>
+<chapter>
 <title>Properties</title>
 &Properties;
 </chapter>
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 050c6896372..21e3f0d945c 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -31,7 +31,7 @@ inline int getpid() { return _getpid(); }
 // non dll-interface class ... used as base for dll-interface class ...
 #   pragma warning( disable : 4275 )
 
-#   ifdef ICE_EXPORTS
+#   ifdef ICE_API_EXPORTS
 #       define ICE_API __declspec(dllexport)
 #   else
 #       define ICE_API __declspec(dllimport)
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index c5a44a46e21..b5c88793cd2 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -17,16 +17,6 @@
 #include <Ice/ReferenceF.h>
 #include <Ice/Shared.h>
 
-namespace IceInternal
-{
-
-class Stream;
-
-ICE_API void write(Stream*, const ::Ice::ObjectPrx&);
-ICE_API void read(Stream*, ::Ice::ObjectPrx&);
-
-}
-
 namespace Ice
 {
 
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index 1ba3ff29d62..e84e53c4ab1 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -13,6 +13,7 @@
 
 #include <Ice/InstanceF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ProxyF.h>
 #include <Ice/Buffer.h>
 #include <stack>
 #include <set>
@@ -89,6 +90,9 @@ public:
     void read(std::wstring&);
     void read(std::vector<std::wstring>&);
 
+    void write(const ::Ice::ObjectPrx&);
+    void read(::Ice::ObjectPrx&);
+
     void write(const ::Ice::ObjectPtr&);
     void read(::Ice::ObjectPtr&, const std::string&);
 
diff --git a/cpp/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice
new file mode 100644
index 00000000000..ae6e194be35
--- /dev/null
+++ b/cpp/slice/IcePack/Admin.ice
@@ -0,0 +1,112 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_PACK_ADMIN_ICE
+#define ICE_PACK_ADMIN_ICE
+
+/**
+ *
+ * The Ice object locator and activator.
+ *
+ **/
+module IcePack
+{
+
+/**
+ *
+ * Data describing a server one or more objects implemented by that
+ * server.
+ *
+ **/
+class ServerDescription
+{
+    /**
+     *
+     * The server object or object template. Any non-administrative
+     * IcePack request that matches the identity of
+     * <literal>object</literal> will be forwarded to
+     * <literal>object</literal>. If <literal>regex</literal> is set
+     * to <literal>true</literal>, <literal>object</literal>'s
+     * identity is interpreted as a regular expression, and each
+     * request that matches this expression will be forwarded.
+     *
+     * @see regex
+     *
+     **/
+    Object* object;
+
+    /**
+     *
+     * If set to true, the identity contained in
+     * <literal>object</literal> will be interpreted as regular
+     * expression.
+     *
+     * @see object
+     *
+     **/
+    bool regex;
+    
+    /**
+     *
+     * The optional server host name. If none is given, no automatic
+     * activation will be performed.
+     *
+     * @see path
+     *
+     **/
+    string host;
+
+    /**
+     *
+     * The optional server path. If none is given, no automatic
+     * activation will be performed.
+     *
+     * @see host
+     *
+     **/
+    string path;
+};
+
+/**
+ *
+ * The IcePack administrative interface. <warning><para>Allowing
+ * access to this interface is a security risk! Please see the IcePack
+ * documentation for further information.</para></warning>
+ *
+ **/
+class Admin
+{
+    /**
+     *
+     * Add a server and objects implemented by that server to IcePack.
+     *
+     * @param description The server's description.
+     *
+     * @see remove
+     *
+     **/
+    void add(ServerDescription description);
+
+    /**
+     *
+     * Remove a server and objects implemented by that server from IcePack.
+     *
+     * @param object Must match the field <literal>object</literal> of
+     * the <literal>ServerDescription</literal> data to remove.
+     *
+     * @see add
+     *
+     **/
+    void remove(Object* object);
+};
+
+};
+
+#endif
diff --git a/cpp/slice/IcePack/AdminF.ice b/cpp/slice/IcePack/AdminF.ice
new file mode 100644
index 00000000000..9d3537bf101
--- /dev/null
+++ b/cpp/slice/IcePack/AdminF.ice
@@ -0,0 +1,21 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+#ifndef ICE_PACK_ADMIN_F_ICE
+#define ICE_PACK_ADMIN_F_ICE
+
+module IcePack
+{
+
+class Admin;
+
+};
+
+#endif
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 33f4c0e01e8..ec3d4ea94f0 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -1,5 +1,5 @@
 Shared.o: Shared.cpp ../../include/Ice/Shared.h ../../include/Ice/Config.h
-Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../../include/Ice/ValueFactory.h ../Ice/ValueFactoryManager.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/LocalException.h
+Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ValueFactory.h ../Ice/ValueFactoryManager.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/LocalException.h
 LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/Config.h ../Ice/Network.h
 Pickler.o: Pickler.cpp ../../include/Ice/Pickler.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
 PicklerI.o: PicklerI.cpp ../Ice/PicklerI.h ../../include/Ice/Pickler.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
@@ -18,18 +18,18 @@ ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h .
 ValueFactory.o: ValueFactory.cpp ../../include/Ice/ValueFactory.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h
 ValueFactoryManager.o: ValueFactoryManager.cpp ../Ice/ValueFactoryManager.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ValueFactoryF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/ValueFactory.h
 Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Shared.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/UdpTransceiver.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
-Reference.o: Reference.cpp ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Shared.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
+Reference.o: Reference.cpp ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/Shared.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/LocalException.h
 LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Shared.h
 Object.o: Object.cpp ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h
 ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Shared.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Proxy.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h
-Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../Ice/ObjectAdapterFactory.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
-Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
+Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Object.h ../../include/Ice/ObjectF.h ../Ice/ObjectAdapterFactory.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Reference.h ../Ice/EndpointF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/Emitter.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
+Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Shared.h ../Ice/Emitter.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../../include/Ice/LocalException.h
 Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../../include/Ice/InstanceF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h
 Emitter.o: Emitter.cpp ../Ice/Emitter.h ../../include/Ice/EmitterF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/ThreadPoolF.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ThreadPool.h ../Ice/Endpoint.h ../Ice/AcceptorF.h ../../include/Ice/Outgoing.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
 Collector.o: Collector.cpp ../Ice/Collector.h ../../include/Ice/CollectorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/AcceptorF.h ../Ice/ThreadPoolF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/Shared.h ../Ice/EndpointF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Stream.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Logger.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/Ice/ObjectAdapter.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../../include/Ice/Incoming.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h
 Network.o: Network.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/LocalException.h
-ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h
-EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h
+ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/EventHandlerF.h ../../include/Ice/Shared.h ../Ice/EventHandler.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h ../../include/Ice/Properties.h ../../include/Ice/Functional.h
+EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/Shared.h ../../include/Ice/Stream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/LocalObject.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../Ice/ValueFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PicklerF.h
 Connector.o: Connector.cpp ../Ice/Connector.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/TransceiverF.h ../../include/Ice/Shared.h
 Acceptor.o: Acceptor.cpp ../Ice/Acceptor.h ../Ice/AcceptorF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../Ice/TransceiverF.h ../../include/Ice/Shared.h
 Transceiver.o: Transceiver.cpp ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/Shared.h
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 292c7b45bfd..3e0d5d3761e 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -72,7 +72,7 @@ IceInternal::Incoming::invoke(Stream& is)
     catch(const LocationForward& p)
     {
 	*(_os.b.begin() + statusPos) = static_cast<Byte>(DispatchLocationForward);
-	write(&_os, p._prx);
+	_os.write(p._prx);
     }
 
     if (locator)
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 9181fbb60b9..50c02c12ca5 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -138,7 +138,7 @@ IceInternal::Outgoing::invoke()
 	    if (_state == StateLocationForward)
 	    {
 		ObjectPrx p;
-		read(&_is, p);
+		_is.read(p);
 		throw LocationForward(p);
 	    }
 
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index af0789dfd3b..9f368327613 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -9,7 +9,6 @@
 // **********************************************************************
 
 #include <Ice/Proxy.h>
-#include <Ice/ProxyFactory.h>
 #include <Ice/Object.h>
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Outgoing.h>
@@ -49,18 +48,6 @@ IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::Ice::Object*&
     d = b;
 }
 
-void
-IceInternal::write(Stream* s, const ObjectPrx& v)
-{
-    s->instance()->proxyFactory()->proxyToStream(v, s);
-}
-
-void
-IceInternal::read(Stream* s, ObjectPrx& v)
-{
-    v = s->instance()->proxyFactory()->streamToProxy(s);
-}
-
 Ice::ObjectPrxE::ObjectPrxE(const ObjectPrxE& p) :
     _prx(p._prx)
 {
diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp
index adc744616fa..a6b327a849b 100644
--- a/cpp/src/Ice/Stream.cpp
+++ b/cpp/src/Ice/Stream.cpp
@@ -11,6 +11,8 @@
 #include <Ice/Stream.h>
 #include <Ice/Instance.h>
 #include <Ice/Object.h>
+#include <Ice/Proxy.h>
+#include <Ice/ProxyFactory.h>
 #include <Ice/ValueFactory.h>
 #include <Ice/ValueFactoryManager.h>
 #include <Ice/LocalException.h>
@@ -774,6 +776,18 @@ IceInternal::Stream::read(vector<wstring>& v)
 }
 
 void
+IceInternal::Stream::write(const ::Ice::ObjectPrx& v)
+{
+    _instance->proxyFactory()->proxyToStream(v, this);
+}
+
+void
+IceInternal::Stream::read(::Ice::ObjectPrx& v)
+{
+    v = _instance->proxyFactory()->streamToProxy(this);
+}
+
+void
 IceInternal::Stream::write(const ObjectPtr& v)
 {
     const string* classIds = v->_classIds();
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 33c813733e8..a8401ebbdce 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -74,7 +74,7 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend
new file mode 100644
index 00000000000..6fe0e0596bc
--- /dev/null
+++ b/cpp/src/IcePack/.depend
@@ -0,0 +1 @@
+Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Native.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EmitterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Shared.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Stream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalException.h
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
new file mode 100644
index 00000000000..109c105dc99
--- /dev/null
+++ b/cpp/src/IcePack/Makefile
@@ -0,0 +1,58 @@
+# **********************************************************************
+#
+# Copyright (c) 2001
+# MutableRealms, Inc.
+# Huntsville, AL, USA
+#
+# All Rights Reserved
+#
+# **********************************************************************
+
+top_srcdir	= ../..
+
+BASE		= libIcePack.so
+VERSIONED_BASE	= $(BASE).$(VERSION)
+
+NAME		= $(top_srcdir)/lib/$(BASE)
+VERSIONED_NAME	= $(top_srcdir)/lib/$(VERSIONED_BASE)
+
+TARGETS		= $(NAME) $(VERSIONED_NAME)
+
+OBJS		= Admin.o
+
+SRCS		= $(OBJS:.o=.cpp)
+
+HDIR		= $(includedir)/IcePack
+IDIR		= $(slicedir)/IcePack
+SLICECMD	= $(SLICE) --include-dir IcePack --dll-export ICE_PACK_API -I$(slicedir)
+
+include $(top_srcdir)/config/Make.rules
+
+CPPFLAGS	:= -I.. $(CPPFLAGS)
+
+$(VERSIONED_NAME): $(OBJS)
+	rm -f $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS)
+
+$(NAME): $(VERSIONED_NAME)
+	rm -f $@
+	ln -s $(VERSIONED_BASE) $@
+
+$(HDIR)/Admin.h Admin.cpp: $(IDIR)/Admin.ice $(SLICE)
+	rm -f $(HDIR)/Admin.h Admin.cpp
+	$(SLICECMD) $(IDIR)/Admin.ice
+	mv Admin.h $(HDIR)
+
+clean::
+	rm -f $(HDIR)/Admin.h Admin.cpp
+
+$(HDIR)/AdminF.h: $(IDIR)/AdminF.ice $(SLICE)
+	rm -f $(HDIR)/AdminF.h AdminF.cpp
+	$(SLICECMD) $(IDIR)/AdminF.ice
+	mv AdminF.h $(HDIR)
+	rm -f AdminF.cpp
+
+clean::
+	rm -f $(HDIR)/AdminF.h
+
+include .depend
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 6af7be3cf62..59a45a9d339 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -12,7 +12,9 @@ top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= slice Ice
+SUBDIRS		= slice \
+		  Ice \
+		  IcePack
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile
index efdb97c94aa..41a1a5c8601 100644
--- a/cpp/src/Slice/Makefile
+++ b/cpp/src/Slice/Makefile
@@ -52,9 +52,9 @@ clean::
 	-rm -f Grammer.cpp Grammer.h Grammer.output
 	-rm -f Scanner.cpp lex.yy.c
 
-Shared.cpp: ../../library/Shared.cpp
+Shared.cpp: ../../Ice/Shared.cpp
 	rm -f $@
-	ln -s ../../library/Shared.cpp $@
+	ln -s ../../Ice/Shared.cpp $@
 
 clean::
 	-rm -f Shared.cpp
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend
index de3053fcdab..41caad21c33 100644
--- a/cpp/src/slice2cpp/.depend
+++ b/cpp/src/slice2cpp/.depend
@@ -1,3 +1,3 @@
-Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
+Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h
 GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
 Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 57206998170..c261ac5ee5f 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -10,7 +10,6 @@
 
 #include <Ice/Functional.h>
 #include <Gen.h>
-#include <GenUtil.h>
 #include <limits>
 
 //
@@ -158,6 +157,22 @@ Slice::Gen::generate(const UnitPtr& unit)
     C << "\n#endif";
     C.restoreIndent();
 
+    if (_dllExport.length())
+    {
+	H << sp;
+	H.zeroIndent();
+	H << "\n#ifdef WIN32";
+	H << "\n#   ifdef" << _dllExport << "_EXPORTS";
+	H << "\n#       define" << _dllExport << " __declspec(dllexport)";
+	H << "\n#   else";
+	H << "\n#       define" << _dllExport << " __declspec(dllimport)";
+	H << "\n#   endif";
+	H << "\n#else";
+	H << "\n#   define" << _dllExport << " /**/";
+	H << "\n#endif";
+	H.restoreIndent();
+    }
+
     ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
     unit->visit(&proxyDeclVisitor);
 
@@ -1849,15 +1864,13 @@ Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDefPtr& p)
     C << sp;
     C << nl << "void" << nl << scope << "::__write(::IceInternal::Stream* __os, const " << scoped << "Prx& v)";
     C << sb;
-    // TODO: Should be ::Ice::__write
-    C << nl << "::IceInternal::write(__os, ::Ice::ObjectPrx(v));";
+    C << nl << "__os->write(::Ice::ObjectPrx(v));";
     C << eb;
     C << sp;
     C << nl << "void" << nl << scope << "::__read(::IceInternal::Stream* __is, " << scoped << "Prx& v)";
     C << sb;
     C << nl << "::Ice::ObjectPrx proxy;";
-    // TODO: Should be ::Ice::__read
-    C << nl << "::IceInternal::read(__is, proxy);";
+    C << nl << "__is->read(proxy);";
     C << nl << "if (!proxy)";
     C << sb;
     C << nl << "v = 0;";
diff --git a/cpp/src/slice2docbook/.depend b/cpp/src/slice2docbook/.depend
index de3053fcdab..90c5be97e71 100644
--- a/cpp/src/slice2docbook/.depend
+++ b/cpp/src/slice2docbook/.depend
@@ -1,3 +1,2 @@
-Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
-GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
+Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h
 Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index b7bfed1296f..f0dbc86d38c 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -10,7 +10,6 @@
 
 #include <Ice/Functional.h>
 #include <Gen.h>
-#include <GenUtil.h>
 
 using namespace std;
 using namespace Slice;
@@ -18,7 +17,8 @@ using namespace Slice;
 Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool noGlobals) :
     _standAlone(standAlone),
     _noGlobals(noGlobals),
-    _chapter("section") // Could also be "chapter"
+    _chapter("section"), // Could also be "chapter"
+    _nextId(0)
 {
     O.open(file.c_str());
     if (!O)
@@ -26,6 +26,13 @@ Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool no
 	cerr << name << ": can't open `" << file << "' for writing: " << strerror(errno) << endl;
 	return;
     }
+
+    _idPrefix = file;
+    string::size_type pos = _idPrefix.find_last_of("/\\");
+    if(pos != string::npos)
+    {
+	_idPrefix.erase(0, pos + 1);
+    }
 }
 
 Slice::Gen::~Gen()
@@ -734,3 +741,129 @@ Slice::Gen::end()
     O.dec();
     O << nl << "</" << element << '>';
 }
+
+string
+Slice::Gen::scopedToId(const string& scoped)
+{
+    string s;
+    if (scoped[0] == ':')
+    {
+	s = scoped.substr(2);
+    }
+    else
+    {
+	s = scoped;
+    }
+
+    int id = _idMap[s];
+    if (id == 0)
+    {
+	id = ++_nextId;
+	_idMap[s] = id;
+    }
+
+    ostringstream result;
+    result << '"' << _idPrefix << '.' << id << '"';
+    return result.str();
+}
+
+string
+Slice::Gen::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container)
+{
+    string s = contained->scoped();
+    ContainerPtr p = container;
+    ContainedPtr q;
+
+    while((q = ContainedPtr::dynamicCast(p)))
+    {
+	string s2 = q->scoped();
+	s2 += "::";
+
+	if (s.find(s2) == 0)
+	{
+	    return s.substr(s2.size());
+	}
+
+	p = q->container();
+    }
+
+    return s;
+}
+
+string
+Slice::Gen::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container)
+{
+    static const char* builtinTable[] =
+    {
+	"byte",
+	"bool",
+	"short",
+	"int",
+	"long",
+	"float",
+	"double",
+	"string",
+	"wstring",
+	"Object",
+	"Object*",
+	"LocalObject"
+    };
+
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
+    if (builtin)
+    {
+	return "<type>" + string(builtinTable[builtin->kind()]) + "</type>";
+    }
+
+    string tag;
+    string linkend;
+    string s;
+
+    ProxyPtr proxy = ProxyPtr::dynamicCast(p);
+    if (proxy)
+    {
+	tag = "classname";
+	linkend = scopedToId(proxy->_class()->scoped());
+	s = getScopedMinimized(proxy->_class(), container);
+	s += "*";
+    }
+
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(p);
+    if (cl)
+    {
+	tag = "classname";
+	linkend = scopedToId(cl->scoped());
+	s = getScopedMinimized(cl, container);
+    }
+
+    if (s.empty())
+    {
+	ContainedPtr contained = ContainedPtr::dynamicCast(p);
+	assert(contained);
+	tag = "type";
+	linkend = scopedToId(contained->scoped());
+	s = getScopedMinimized(contained, container);
+    }
+
+    return "<link linkend=" + linkend + "><" + tag + ">" + s + "</" + tag + "></link>";
+}
+
+string
+Slice::Gen::toString(const string& str, const ContainerPtr& container)
+{
+    string s = str;
+
+    TypeList types = container->lookupType(s, false);
+    if (!types.empty())
+    {
+	return toString(types.front(), container);
+    }
+
+    ContainedList contList = container->lookupContained(s, false);
+    if (!contList.empty())
+    {
+	return toString(contList.front(), container);
+    }
+
+    return s;
+}
diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h
index 61e8522bc09..60b89ac6a90 100644
--- a/cpp/src/slice2docbook/Gen.h
+++ b/cpp/src/slice2docbook/Gen.h
@@ -45,12 +45,20 @@ private:
     void start(const std::string&, const std::string&);
     void end();
 
+    std::string scopedToId(const std::string&);
+    std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&);
+    std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&);
+    std::string toString(const std::string&, const ContainerPtr&);
+
     Output O;
 
     bool _standAlone;
     bool _noGlobals;
     std::string _chapter;
     std::stack<std::string> _elementStack;
+    std::string _idPrefix;
+    std::map<std::string, int> _idMap;
+    int _nextId;
 };
 
 }
diff --git a/cpp/src/slice2docbook/GenUtil.cpp b/cpp/src/slice2docbook/GenUtil.cpp
deleted file mode 100644
index 470eaa3ba9c..00000000000
--- a/cpp/src/slice2docbook/GenUtil.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#include <GenUtil.h>
-#include <sstream>
-
-using namespace std;
-using namespace Slice;
-
-string
-Slice::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container)
-{
-    string s = contained->scoped();
-    ContainerPtr p = container;
-    ContainedPtr q;
-
-    while((q = ContainedPtr::dynamicCast(p)))
-    {
-	string s2 = q->scoped();
-	s2 += "::";
-
-	if (s.find(s2) == 0)
-	{
-	    return s.substr(s2.size());
-	}
-
-	p = q->container();
-    }
-
-    return s;
-}
-
-string
-Slice::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container)
-{
-    static const char* builtinTable[] =
-    {
-	"byte",
-	"bool",
-	"short",
-	"int",
-	"long",
-	"float",
-	"double",
-	"string",
-	"wstring",
-	"Object",
-	"Object*",
-	"LocalObject"
-    };
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
-    if (builtin)
-    {
-	return "<type>" + string(builtinTable[builtin->kind()]) + "</type>";
-    }
-
-    string tag;
-    string linkend;
-    string s;
-
-    ProxyPtr proxy = ProxyPtr::dynamicCast(p);
-    if (proxy)
-    {
-	tag = "classname";
-	linkend = scopedToId(proxy->_class()->scoped());
-	s = getScopedMinimized(proxy->_class(), container);
-	s += "*";
-    }
-
-    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(p);
-    if (cl)
-    {
-	tag = "classname";
-	linkend = scopedToId(cl->scoped());
-	s = getScopedMinimized(cl, container);
-    }
-
-    if (s.empty())
-    {
-	ContainedPtr contained = ContainedPtr::dynamicCast(p);
-	assert(contained);
-	tag = "type";
-	linkend = scopedToId(contained->scoped());
-	s = getScopedMinimized(contained, container);
-    }
-
-    return "<link linkend=" + linkend + "><" + tag + ">" + s + "</" + tag + "></link>";
-}
-
-string
-Slice::toString(const string& str, const ContainerPtr& container)
-{
-    string s = str;
-
-    TypeList types = container->lookupType(s, false);
-    if (!types.empty())
-    {
-	return toString(types.front(), container);
-    }
-
-    ContainedList contList = container->lookupContained(s, false);
-    if (!contList.empty())
-    {
-	return toString(contList.front(), container);
-    }
-
-    return s;
-}
-
-struct ToFile
-{
-    char operator()(char c)
-    {
-	if (c == ':')
-	{
-	    return '_';
-	}
-	else
-	{
-	    return c;
-	}
-    }
-};
-
-string
-Slice::scopedToId(const string& scoped)
-{
-    static map<string, int> idMap;
-    static int _nextId = 0;
-
-    string s;
-    if (scoped[0] == ':')
-    {
-	s = scoped.substr(2);
-    }
-    else
-    {
-	s = scoped;
-    }
-
-    int id = idMap[s];
-    if (id == 0)
-    {
-	id = ++_nextId;
-	idMap[s] = id;
-    }
-
-    ostringstream result;
-    result << "\"slice2docbook." << id << '"';
-    return result.str();
-}
diff --git a/cpp/src/slice2docbook/GenUtil.h b/cpp/src/slice2docbook/GenUtil.h
deleted file mode 100644
index b353f4d0e1e..00000000000
--- a/cpp/src/slice2docbook/GenUtil.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef GEN_UTIL_H
-#define GEN_UTIL_H
-
-#include <Parser.h>
-#include <OutputUtil.h>
-
-namespace Slice
-{
-
-std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&);
-std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&);
-std::string toString(const std::string&, const ContainerPtr&);
-std::string scopedToId(const std::string&);
-
-}
-
-#endif
diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile
index e52cf8d0289..4b3d02d1303 100644
--- a/cpp/src/slice2docbook/Makefile
+++ b/cpp/src/slice2docbook/Makefile
@@ -15,7 +15,6 @@ NAME		= $(top_srcdir)/bin/slice2docbook
 TARGETS		= $(NAME)
 
 OBJS		= Gen.o \
-		  GenUtil.o \
 		  Main.o
 
 SRCS		= $(OBJS:.o=.cpp)
diff --git a/cpp/src/slice2docbook/docbook.dsp b/cpp/src/slice2docbook/docbook.dsp
index 96f2d02d71a..5dd23646936 100644
--- a/cpp/src/slice2docbook/docbook.dsp
+++ b/cpp/src/slice2docbook/docbook.dsp
@@ -91,10 +91,6 @@ SOURCE=.\Gen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\GenUtil.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\Main.cpp
 # End Source File
 # End Group
@@ -105,10 +101,6 @@ SOURCE=.\Main.cpp
 
 SOURCE=.\Gen.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\GenUtil.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"
author	Marc Laukien <marc@zeroc.com>	2001-08-14 21:00:02 +0000
committer	Marc Laukien <marc@zeroc.com>	2001-08-14 21:00:02 +0000
commit	b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598 (patch)
tree	9a117cb3adc3f755026346c939853719aeb5cecd /cpp
parent	changed directory structure (diff)
download	ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.tar.bz2 ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.tar.xz ice-b2b071cf79af4e4d71c6ce41da7d3b4ae3cf9598.zip