4 files changed, 3 insertions, 132 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 9c1a46cc99e..c066ee1cbb0 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -182,13 +182,6 @@ IceUtil::printException(ostream& out, const OperationNotExistException& ex)
 }
 
 ostream&
-IceUtil::printException(ostream& out, const NoServantFactoryException& ex)
-{
-    IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": no servant factory found for the requested servant type";
-}
-
-ostream&
 IceUtil::printException(ostream& out, const SystemException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
@@ -256,7 +249,7 @@ ostream&
 IceUtil::printException(ostream& out, const ServantUnmarshalException& ex)
 {
     IceUtil::printException(out, static_cast<const IceUtil::Exception&>(ex));
-    return out << ": protocol error: servant type does not match signature";
+    return out << ": protocol error: no suitable servant factory available";
 }
 
 ostream&
diff --git a/cpp/src/Ice/LocalException.cpp b/cpp/src/Ice/LocalException.cpp
index c0f65123f93..2319eb288fa 100644
--- a/cpp/src/Ice/LocalException.cpp
+++ b/cpp/src/Ice/LocalException.cpp
@@ -425,47 +425,6 @@ Ice::OperationNotExistException::_throw() const
     throw *this;
 }
 
-Ice::NoServantFactoryException::NoServantFactoryException(const char* file, int line) :
-    LocalException(file, line)
-{
-}
-
-Ice::NoServantFactoryException::NoServantFactoryException(const NoServantFactoryException& ex) :
-    LocalException(ex)
-{
-}
-
-NoServantFactoryException&
-Ice::NoServantFactoryException::operator=(const NoServantFactoryException& ex)
-{
-    LocalException::operator=(ex);
-    return *this;
-}
-
-string
-Ice::NoServantFactoryException::_name() const
-{
-    return "Ice::NoServantFactoryException";
-}
-
-ostream&
-Ice::NoServantFactoryException::_print(ostream& out) const
-{
-    return IceUtil::printException(out, *this);
-}
-
-LocalException*
-Ice::NoServantFactoryException::_clone() const
-{
-    return new NoServantFactoryException(*this);
-}
-
-void
-Ice::NoServantFactoryException::_throw() const
-{
-    throw *this;
-}
-
 Ice::SystemException::SystemException(const char* file, int line) :
     LocalException(file, line)
 {
diff --git a/cpp/src/Ice/PicklerI.cpp b/cpp/src/Ice/PicklerI.cpp
deleted file mode 100644
index 42d8ba0442d..00000000000
--- a/cpp/src/Ice/PicklerI.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#include <Ice/PicklerI.h>
-#include <Ice/BasicStream.h>
-#include <Ice/Exception.h>
-#include <Ice/Protocol.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-void
-Ice::PicklerI::pickle(const ObjectPtr& servant, std::ostream& out)
-{
-    BasicStream s(_instance);
-    s.startWriteEncaps();
-    s.write(servant);
-    s.endWriteEncaps();
-    out.write(s.b.begin(), s.b.size());
-    if (!out)
-    {
-	throw SystemException(__FILE__, __LINE__);
-    }
-}
-
-ObjectPtr
-Ice::PicklerI::unpickle(const string& type, std::istream& in)
-{
-    BasicStream s(_instance);
-    s.b.resize(4); // Encapsulation length == Ice::Int
-    in.read(s.b.begin(), 4);
-    if (in.eof())
-    {
-	throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    if (!in)
-    {
-	throw SystemException(__FILE__, __LINE__);
-    }
-
-    s.i = s.b.begin();	    
-    Int sz;
-    s.read(sz);
-
-    // Don't use s.b.resize() here, otherwise no size sanity checks
-    // will be done
-    s.resize(4 + sz);
-    in.read(s.b.begin() + 4, sz);
-    if (in.eof())
-    {
-	throw UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-    if (!in)
-    {
-	throw SystemException(__FILE__, __LINE__);
-    }
-
-    s.i = s.b.begin();
-    s.startReadEncaps();
-    ObjectPtr servant;
-    s.read(servant, type);
-    s.endReadEncaps();
-    if (!servant)
-    {
-	throw NoServantFactoryException(__FILE__, __LINE__);
-    }
-    return servant;    
-}
-
-Ice::PicklerI::PicklerI(const InstancePtr& instance) :
-    _instance(instance)
-{
-}
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 1ad59407722..fdada815356 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -541,7 +541,7 @@ Slice::Gen::visitExceptionStart(const ExceptionPtr& p)
     {
 	O << "local ";
     }
-    O << "exception <exceptionname>" << p->name() << "</exceptionname>";
+    O << "exception <classname>" << p->name() << "</classname>";
     ExceptionPtr base = p->base();
     if (base)
     {
@@ -1187,7 +1187,7 @@ Slice::Gen::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& container)
     {
 	linkend = containedToId(ex);
 	s = getScopedMinimized(ex, container);
-	tag = "exceptionname";
+	tag = "classname";
     }
 
     StructPtr st = StructPtr::dynamicCast(p);