fixes

5 files changed, 870 insertions, 1478 deletions

diff --git a/cpp/src/IcePack/Admin.cpp b/cpp/src/IcePack/Admin.cpp
index 01f83491138..4b794db3392 100644
--- a/cpp/src/IcePack/Admin.cpp
+++ b/cpp/src/IcePack/Admin.cpp
@@ -1,616 +1,616 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `Admin.ice'
-// Ice version 0.0.1
-
-#include <IcePack/Admin.h>
-
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION != 0x1
-#       error Ice version mismatch!
-#   endif
-#endif
-
-void IceInternal::incRef(::IcePack::ServerDescription* p) { p->__incRef(); }
-void IceInternal::decRef(::IcePack::ServerDescription* p) { p->__decRef(); }
-
-void IceInternal::incRef(::IceProxy::IcePack::ServerDescription* p) { p->__incRef(); }
-void IceInternal::decRef(::IceProxy::IcePack::ServerDescription* p) { p->__decRef(); }
-
-void IceInternal::checkedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::ServerDescription*& d)
-{
-    d = dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(b);
-    if (!d && b->_isA("::IcePack::ServerDescription"))
-    {
-	d = new ::IceProxy::IcePack::ServerDescription;
-	b->__copyTo(d);
-    }
-}
-
-void IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::ServerDescription*& d)
-{
-    d = dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(b);
-    if (!d)
-    {
-	d = new ::IceProxy::IcePack::ServerDescription;
-	b->__copyTo(d);
-    }
-}
-
-void IceInternal::incRef(::IcePack::Admin* p) { p->__incRef(); }
-void IceInternal::decRef(::IcePack::Admin* p) { p->__decRef(); }
-
-void IceInternal::incRef(::IceProxy::IcePack::Admin* p) { p->__incRef(); }
-void IceInternal::decRef(::IceProxy::IcePack::Admin* p) { p->__decRef(); }
-
-void IceInternal::checkedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::Admin*& d)
-{
-    d = dynamic_cast< ::IceProxy::IcePack::Admin*>(b);
-    if (!d && b->_isA("::IcePack::Admin"))
-    {
-	d = new ::IceProxy::IcePack::Admin;
-	b->__copyTo(d);
-    }
-}
-
-void IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::Admin*& d)
-{
-    d = dynamic_cast< ::IceProxy::IcePack::Admin*>(b);
-    if (!d)
-    {
-	d = new ::IceProxy::IcePack::Admin;
-	b->__copyTo(d);
-    }
-}
-
-void
-IcePack::__write(::IceInternal::Stream* __os, const ::IcePack::ServerDescriptionPrx& v)
-{
-    __os->write(::Ice::ObjectPrx(v));
-}
-
-void
-IcePack::__read(::IceInternal::Stream* __is, ::IcePack::ServerDescriptionPrx& v)
-{
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if (!proxy)
-    {
-	v = 0;
-    }
-    else
-    {
-	v = new ::IceProxy::IcePack::ServerDescription;
-	proxy->__copyTo(v.get());
-    }
-}
-
-void
-IcePack::__write(::IceInternal::Stream* __os, const ::IcePack::AdminPrx& v)
-{
-    __os->write(::Ice::ObjectPrx(v));
-}
-
-void
-IcePack::__read(::IceInternal::Stream* __is, ::IcePack::AdminPrx& v)
-{
-    ::Ice::ObjectPrx proxy;
-    __is->read(proxy);
-    if (!proxy)
-    {
-	v = 0;
-    }
-    else
-    {
-	v = new ::IceProxy::IcePack::Admin;
-	proxy->__copyTo(v.get());
-    }
-}
-
-void
-IceProxy::IcePack::ServerDescription::_throw()
-{
-    throw ::IcePack::ServerDescriptionPrxE(this);
-}
-
-::IceInternal::Handle< ::IceDelegateM::Ice::Object>
-IceProxy::IcePack::ServerDescription::__createDelegateM()
-{
-    return ::IceInternal::Handle< ::IceDelegateM::Ice::Object>(new ::IceDelegateM::IcePack::ServerDescription);
-}
-
-void
-IceProxy::IcePack::Admin::_throw()
-{
-    throw ::IcePack::AdminPrxE(this);
-}
-
-void
-IceProxy::IcePack::Admin::add(const ::IcePack::ServerDescriptionPtr& description)
-{
-    int __cnt = 0;
-    while (true)
-    {
-	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();
-	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());
-	try
-	{
-	    __del->add(description);
-	    return;
-	}
-	catch (const ::Ice::LocationForward& __ex)
-	{
-	    __locationForward(__ex);
-	}
-	catch (const ::IceInternal::NonRepeatable& __ex)
-	{
-	    __ex.raise();
-	}
-	catch (const ::Ice::LocalException& __ex)
-	{
-	    __handleException(__ex, __cnt);
-	}
-    }
-}
-
-void
-IceProxy::IcePack::Admin::remove(const ::Ice::ObjectPrx& object)
-{
-    int __cnt = 0;
-    while (true)
-    {
-	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();
-	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());
-	try
-	{
-	    __del->remove(object);
-	    return;
-	}
-	catch (const ::Ice::LocationForward& __ex)
-	{
-	    __locationForward(__ex);
-	}
-	catch (const ::IceInternal::NonRepeatable& __ex)
-	{
-	    __ex.raise();
-	}
-	catch (const ::Ice::LocalException& __ex)
-	{
-	    __handleException(__ex, __cnt);
-	}
-    }
-}
-
-::IcePack::ServerDescriptionPtr
-IceProxy::IcePack::Admin::find(const ::Ice::ObjectPrx& object)
-{
-    int __cnt = 0;
-    while (true)
-    {
-	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();
-	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());
-	try
-	{
-	    return __del->find(object);
-	}
-	catch (const ::Ice::LocationForward& __ex)
-	{
-	    __locationForward(__ex);
-	}
-	catch (const ::IceInternal::NonRepeatable& __ex)
-	{
-	    __ex.raise();
-	}
-	catch (const ::Ice::LocalException& __ex)
-	{
-	    __handleException(__ex, __cnt);
-	}
-    }
-}
-
-void
-IceProxy::IcePack::Admin::shutdown()
-{
-    int __cnt = 0;
-    while (true)
-    {
-	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();
-	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());
-	try
-	{
-	    __del->shutdown();
-	    return;
-	}
-	catch (const ::Ice::LocationForward& __ex)
-	{
-	    __locationForward(__ex);
-	}
-	catch (const ::IceInternal::NonRepeatable& __ex)
-	{
-	    __ex.raise();
-	}
-	catch (const ::Ice::LocalException& __ex)
-	{
-	    __handleException(__ex, __cnt);
-	}
-    }
-}
-
-::IceInternal::Handle< ::IceDelegateM::Ice::Object>
-IceProxy::IcePack::Admin::__createDelegateM()
-{
-    return ::IceInternal::Handle< ::IceDelegateM::Ice::Object>(new ::IceDelegateM::IcePack::Admin);
-}
-
-void
-IceDelegateM::IcePack::Admin::add(const ::IcePack::ServerDescriptionPtr& description)
-{
-    ::IceInternal::Outgoing __out(__emitter(), __reference());
-    ::IceInternal::Stream* __os = __out.os();
-    __os->write("add");
-    {
-	::Ice::ObjectPtr __obj = description;
-	__os->write(__obj);
-    }
-    if (!__out.invoke())
-    {
-	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-}
-
-void
-IceDelegateM::IcePack::Admin::remove(const ::Ice::ObjectPrx& object)
-{
-    ::IceInternal::Outgoing __out(__emitter(), __reference());
-    ::IceInternal::Stream* __os = __out.os();
-    __os->write("remove");
-    __os->write(object);
-    if (!__out.invoke())
-    {
-	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-}
-
-::IcePack::ServerDescriptionPtr
-IceDelegateM::IcePack::Admin::find(const ::Ice::ObjectPrx& object)
-{
-    ::IceInternal::Outgoing __out(__emitter(), __reference());
-    ::IceInternal::Stream* __is = __out.is();
-    ::IceInternal::Stream* __os = __out.os();
-    __os->write("find");
-    __os->write(object);
-    if (!__out.invoke())
-    {
-	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-    ::IcePack::ServerDescriptionPtr __ret;
-    {
-	::Ice::ObjectPtr __obj;
-	__is->read(__obj, ::IcePack::ServerDescription::__classIds[0]);
-	if (!__obj)
-	{
-	    __obj = new ::IcePack::ServerDescription;
-	    __obj->__read(__is);
-	}
-	__ret = ::IcePack::ServerDescriptionPtr::dynamicCast(__obj);
-	if (!__ret)
-	{
-	    throw ::Ice::ValueUnmarshalException(__FILE__, __LINE__);
-	}
-    }
-    return __ret;
-}
-
-void
-IceDelegateM::IcePack::Admin::shutdown()
-{
-    ::IceInternal::Outgoing __out(__emitter(), __reference());
-    ::IceInternal::Stream* __os = __out.os();
-    __os->write("shutdown");
-    if (!__out.invoke())
-    {
-	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-}
-
-IcePack::ServerDescriptionPtrE::ServerDescriptionPtrE(const ServerDescriptionPtrE& p)
-{
-    _ptr = p._ptr;
-}
-
-IcePack::ServerDescriptionPtrE::ServerDescriptionPtrE(const ::IcePack::ServerDescriptionPtr& p)
-{
-    _ptr = p;
-}
-
-IcePack::ServerDescriptionPtrE::operator ::IcePack::ServerDescriptionPtr() const
-{
-    return ::IcePack::ServerDescriptionPtr(dynamic_cast< ::IcePack::ServerDescription*>(_ptr.get()));
-}
-
-::IcePack::ServerDescription*
-IcePack::ServerDescriptionPtrE::operator->() const
-{
-    return dynamic_cast< ::IcePack::ServerDescription*>(_ptr.get());
-}
-
-IcePack::ServerDescriptionPrxE::ServerDescriptionPrxE(const ServerDescriptionPrxE& p)
-{
-    _prx = p._prx;
-}
-
-IcePack::ServerDescriptionPrxE::ServerDescriptionPrxE(const ::IcePack::ServerDescriptionPrx& p)
-{
-    _prx = p;
-}
-
-IcePack::ServerDescriptionPrxE::operator ::IcePack::ServerDescriptionPrx() const
-{
-    return ::IcePack::ServerDescriptionPrx(dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(_prx.get()));
-}
-
-::IceProxy::IcePack::ServerDescription*
-IcePack::ServerDescriptionPrxE::operator->() const
-{
-    return dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(_prx.get());
-}
-
-void
-IcePack::ServerDescription::_throw()
-{
-    throw ::IcePack::ServerDescriptionPtrE(this);
-}
-
-std::string IcePack::ServerDescription::__ids[2] =
-{
-    "::Ice::Object",
-    "::IcePack::ServerDescription"
-};
-
-std::string IcePack::ServerDescription::__classIds[2] =
-{
-    "::IcePack::ServerDescription",
-    "::Ice::Object"
-};
-
-bool
-IcePack::ServerDescription::_isA(const std::string& s)
-{
-    std::string* b = __ids;
-    std::string* e = __ids + 2;
-    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);
-    return r.first != r.second;
-}
-
-const std::string*
-IcePack::ServerDescription::_classIds()
-{
-    return __classIds;
-}
-
-void
-IcePack::ServerDescription::__write(::IceInternal::Stream* __os)
-{
-    __os->startWriteEncaps();
-    __os->write(object);
-    __os->write(regex);
-    __os->write(host);
-    __os->write(path);
-    __os->endWriteEncaps();
-}
-
-void
-IcePack::ServerDescription::__read(::IceInternal::Stream* __is)
-{
-    __is->startReadEncaps();
-    __is->read(object);
-    __is->read(regex);
-    __is->read(host);
-    __is->read(path);
-    __is->endReadEncaps();
-}
-
-IcePack::AdminPtrE::AdminPtrE(const AdminPtrE& p)
-{
-    _ptr = p._ptr;
-}
-
-IcePack::AdminPtrE::AdminPtrE(const ::IcePack::AdminPtr& p)
-{
-    _ptr = p;
-}
-
-IcePack::AdminPtrE::operator ::IcePack::AdminPtr() const
-{
-    return ::IcePack::AdminPtr(dynamic_cast< ::IcePack::Admin*>(_ptr.get()));
-}
-
-::IcePack::Admin*
-IcePack::AdminPtrE::operator->() const
-{
-    return dynamic_cast< ::IcePack::Admin*>(_ptr.get());
-}
-
-IcePack::AdminPrxE::AdminPrxE(const AdminPrxE& p)
-{
-    _prx = p._prx;
-}
-
-IcePack::AdminPrxE::AdminPrxE(const ::IcePack::AdminPrx& p)
-{
-    _prx = p;
-}
-
-IcePack::AdminPrxE::operator ::IcePack::AdminPrx() const
-{
-    return ::IcePack::AdminPrx(dynamic_cast< ::IceProxy::IcePack::Admin*>(_prx.get()));
-}
-
-::IceProxy::IcePack::Admin*
-IcePack::AdminPrxE::operator->() const
-{
-    return dynamic_cast< ::IceProxy::IcePack::Admin*>(_prx.get());
-}
-
-void
-IcePack::Admin::_throw()
-{
-    throw ::IcePack::AdminPtrE(this);
-}
-
-std::string IcePack::Admin::__ids[2] =
-{
-    "::Ice::Object",
-    "::IcePack::Admin"
-};
-
-std::string IcePack::Admin::__classIds[2] =
-{
-    "::IcePack::Admin",
-    "::Ice::Object"
-};
-
-bool
-IcePack::Admin::_isA(const std::string& s)
-{
-    std::string* b = __ids;
-    std::string* e = __ids + 2;
-    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);
-    return r.first != r.second;
-}
-
-const std::string*
-IcePack::Admin::_classIds()
-{
-    return __classIds;
-}
-
-::IceInternal::DispatchStatus
-IcePack::Admin::___add(::IceInternal::Incoming& __in)
-{
-    ::IceInternal::Stream* __is = __in.is();
-    ::IcePack::ServerDescriptionPtr description;
-    {
-	::Ice::ObjectPtr __obj;
-	__is->read(__obj, ::IcePack::ServerDescription::__classIds[0]);
-	if (!__obj)
-	{
-	    __obj = new ::IcePack::ServerDescription;
-	    __obj->__read(__is);
-	}
-	description = ::IcePack::ServerDescriptionPtr::dynamicCast(__obj);
-	if (!description)
-	{
-	    throw ::Ice::ValueUnmarshalException(__FILE__, __LINE__);
-	}
-    }
-    add(description);
-    return ::IceInternal::DispatchOK;
-}
-
-::IceInternal::DispatchStatus
-IcePack::Admin::___remove(::IceInternal::Incoming& __in)
-{
-    ::IceInternal::Stream* __is = __in.is();
-    ::Ice::ObjectPrx object;
-    __is->read(object);
-    remove(object);
-    return ::IceInternal::DispatchOK;
-}
-
-::IceInternal::DispatchStatus
-IcePack::Admin::___find(::IceInternal::Incoming& __in)
-{
-    ::IceInternal::Stream* __is = __in.is();
-    ::IceInternal::Stream* __os = __in.os();
-    ::Ice::ObjectPrx object;
-    __is->read(object);
-    ::IcePack::ServerDescriptionPtr __ret = find(object);
-    {
-	::Ice::ObjectPtr __obj = __ret;
-	__os->write(__obj);
-    }
-    return ::IceInternal::DispatchOK;
-}
-
-::IceInternal::DispatchStatus
-IcePack::Admin::___shutdown(::IceInternal::Incoming& __in)
-{
-    shutdown();
-    return ::IceInternal::DispatchOK;
-}
-
-std::string IcePack::Admin::__names[6] =
-{
-    "_isA",
-    "_ping",
-    "add",
-    "find",
-    "remove",
-    "shutdown"
-};
-
-::IceInternal::DispatchStatus
-IcePack::Admin::__dispatch(::IceInternal::Incoming& in, const std::string& s)
-{
-    std::string* b = __names;
-    std::string* e = __names + 6;
-    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);
-    if (r.first == r.second)
-    {
-	return ::IceInternal::DispatchOperationNotExist;
-    }
-
-    switch (r.first - __names)
-    {
-	case 0:
-	{
-	    return ____isA(in);
-	}
-	case 1:
-	{
-	    return ____ping(in);
-	}
-	case 2:
-	{
-	    return ___add(in);
-	}
-	case 3:
-	{
-	    return ___find(in);
-	}
-	case 4:
-	{
-	    return ___remove(in);
-	}
-	case 5:
-	{
-	    return ___shutdown(in);
-	}
-    }
-
-    assert(false);
-    return ::IceInternal::DispatchOperationNotExist;
-}
-
-void
-IcePack::Admin::__write(::IceInternal::Stream* __os)
-{
-    __os->startWriteEncaps();
-    __os->endWriteEncaps();
-}
-
-void
-IcePack::Admin::__read(::IceInternal::Stream* __is)
-{
-    __is->startReadEncaps();
-    __is->endReadEncaps();
-}
+// **********************************************************************

+//

+// Copyright (c) 2001

+// MutableRealms, Inc.

+// Huntsville, AL, USA

+//

+// All Rights Reserved

+//

+// **********************************************************************

+

+// Generated from file `Admin.ice'

+// Ice version 0.0.1

+

+#include <IcePack/Admin.h>

+

+#ifndef ICE_IGNORE_VERSION

+#   if ICE_INT_VERSION != 0x1

+#       error Ice version mismatch!

+#   endif

+#endif

+

+void IceInternal::incRef(::IcePack::ServerDescription* p) { p->__incRef(); }

+void IceInternal::decRef(::IcePack::ServerDescription* p) { p->__decRef(); }

+

+void IceInternal::incRef(::IceProxy::IcePack::ServerDescription* p) { p->__incRef(); }

+void IceInternal::decRef(::IceProxy::IcePack::ServerDescription* p) { p->__decRef(); }

+

+void IceInternal::checkedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::ServerDescription*& d)

+{

+    d = dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(b);

+    if (!d && b->_isA("::IcePack::ServerDescription"))

+    {

+	d = new ::IceProxy::IcePack::ServerDescription;

+	b->__copyTo(d);

+    }

+}

+

+void IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::ServerDescription*& d)

+{

+    d = dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(b);

+    if (!d)

+    {

+	d = new ::IceProxy::IcePack::ServerDescription;

+	b->__copyTo(d);

+    }

+}

+

+void IceInternal::incRef(::IcePack::Admin* p) { p->__incRef(); }

+void IceInternal::decRef(::IcePack::Admin* p) { p->__decRef(); }

+

+void IceInternal::incRef(::IceProxy::IcePack::Admin* p) { p->__incRef(); }

+void IceInternal::decRef(::IceProxy::IcePack::Admin* p) { p->__decRef(); }

+

+void IceInternal::checkedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::Admin*& d)

+{

+    d = dynamic_cast< ::IceProxy::IcePack::Admin*>(b);

+    if (!d && b->_isA("::IcePack::Admin"))

+    {

+	d = new ::IceProxy::IcePack::Admin;

+	b->__copyTo(d);

+    }

+}

+

+void IceInternal::uncheckedCast(::IceProxy::Ice::Object* b, ::IceProxy::IcePack::Admin*& d)

+{

+    d = dynamic_cast< ::IceProxy::IcePack::Admin*>(b);

+    if (!d)

+    {

+	d = new ::IceProxy::IcePack::Admin;

+	b->__copyTo(d);

+    }

+}

+

+void

+IcePack::__write(::IceInternal::Stream* __os, const ::IcePack::ServerDescriptionPrx& v)

+{

+    __os->write(::Ice::ObjectPrx(v));

+}

+

+void

+IcePack::__read(::IceInternal::Stream* __is, ::IcePack::ServerDescriptionPrx& v)

+{

+    ::Ice::ObjectPrx proxy;

+    __is->read(proxy);

+    if (!proxy)

+    {

+	v = 0;

+    }

+    else

+    {

+	v = new ::IceProxy::IcePack::ServerDescription;

+	proxy->__copyTo(v.get());

+    }

+}

+

+void

+IcePack::__write(::IceInternal::Stream* __os, const ::IcePack::AdminPrx& v)

+{

+    __os->write(::Ice::ObjectPrx(v));

+}

+

+void

+IcePack::__read(::IceInternal::Stream* __is, ::IcePack::AdminPrx& v)

+{

+    ::Ice::ObjectPrx proxy;

+    __is->read(proxy);

+    if (!proxy)

+    {

+	v = 0;

+    }

+    else

+    {

+	v = new ::IceProxy::IcePack::Admin;

+	proxy->__copyTo(v.get());

+    }

+}

+

+void

+IceProxy::IcePack::ServerDescription::_throw()

+{

+    throw ::IcePack::ServerDescriptionPrxE(this);

+}

+

+::IceInternal::Handle< ::IceDelegateM::Ice::Object>

+IceProxy::IcePack::ServerDescription::__createDelegateM()

+{

+    return ::IceInternal::Handle< ::IceDelegateM::Ice::Object>(new ::IceDelegateM::IcePack::ServerDescription);

+}

+

+void

+IceProxy::IcePack::Admin::_throw()

+{

+    throw ::IcePack::AdminPrxE(this);

+}

+

+void

+IceProxy::IcePack::Admin::add(const ::IcePack::ServerDescriptionPtr& description)

+{

+    int __cnt = 0;

+    while (true)

+    {

+	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();

+	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());

+	try

+	{

+	    __del->add(description);

+	    return;

+	}

+	catch (const ::Ice::LocationForward& __ex)

+	{

+	    __locationForward(__ex);

+	}

+	catch (const ::IceInternal::NonRepeatable& __ex)

+	{

+	    __ex.raise();

+	}

+	catch (const ::Ice::LocalException& __ex)

+	{

+	    __handleException(__ex, __cnt);

+	}

+    }

+}

+

+void

+IceProxy::IcePack::Admin::remove(const ::Ice::ObjectPrx& object)

+{

+    int __cnt = 0;

+    while (true)

+    {

+	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();

+	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());

+	try

+	{

+	    __del->remove(object);

+	    return;

+	}

+	catch (const ::Ice::LocationForward& __ex)

+	{

+	    __locationForward(__ex);

+	}

+	catch (const ::IceInternal::NonRepeatable& __ex)

+	{

+	    __ex.raise();

+	}

+	catch (const ::Ice::LocalException& __ex)

+	{

+	    __handleException(__ex, __cnt);

+	}

+    }

+}

+

+::IcePack::ServerDescriptionPtr

+IceProxy::IcePack::Admin::find(const ::Ice::ObjectPrx& object)

+{

+    int __cnt = 0;

+    while (true)

+    {

+	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();

+	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());

+	try

+	{

+	    return __del->find(object);

+	}

+	catch (const ::Ice::LocationForward& __ex)

+	{

+	    __locationForward(__ex);

+	}

+	catch (const ::IceInternal::NonRepeatable& __ex)

+	{

+	    __ex.raise();

+	}

+	catch (const ::Ice::LocalException& __ex)

+	{

+	    __handleException(__ex, __cnt);

+	}

+    }

+}

+

+void

+IceProxy::IcePack::Admin::shutdown()

+{

+    int __cnt = 0;

+    while (true)

+    {

+	::IceInternal::Handle< ::IceDelegate::Ice::Object> __delBase = __getDelegate();

+	::IceDelegate::IcePack::Admin* __del = dynamic_cast< ::IceDelegate::IcePack::Admin*>(__delBase.get());

+	try

+	{

+	    __del->shutdown();

+	    return;

+	}

+	catch (const ::Ice::LocationForward& __ex)

+	{

+	    __locationForward(__ex);

+	}

+	catch (const ::IceInternal::NonRepeatable& __ex)

+	{

+	    __ex.raise();

+	}

+	catch (const ::Ice::LocalException& __ex)

+	{

+	    __handleException(__ex, __cnt);

+	}

+    }

+}

+

+::IceInternal::Handle< ::IceDelegateM::Ice::Object>

+IceProxy::IcePack::Admin::__createDelegateM()

+{

+    return ::IceInternal::Handle< ::IceDelegateM::Ice::Object>(new ::IceDelegateM::IcePack::Admin);

+}

+

+void

+IceDelegateM::IcePack::Admin::add(const ::IcePack::ServerDescriptionPtr& description)

+{

+    ::IceInternal::Outgoing __out(__emitter(), __reference());

+    ::IceInternal::Stream* __os = __out.os();

+    __os->write("add");

+    {

+	::Ice::ObjectPtr __obj = description;

+	__os->write(__obj);

+    }

+    if (!__out.invoke())

+    {

+	throw ::Ice::UnknownUserException(__FILE__, __LINE__);

+    }

+}

+

+void

+IceDelegateM::IcePack::Admin::remove(const ::Ice::ObjectPrx& object)

+{

+    ::IceInternal::Outgoing __out(__emitter(), __reference());

+    ::IceInternal::Stream* __os = __out.os();

+    __os->write("remove");

+    __os->write(object);

+    if (!__out.invoke())

+    {

+	throw ::Ice::UnknownUserException(__FILE__, __LINE__);

+    }

+}

+

+::IcePack::ServerDescriptionPtr

+IceDelegateM::IcePack::Admin::find(const ::Ice::ObjectPrx& object)

+{

+    ::IceInternal::Outgoing __out(__emitter(), __reference());

+    ::IceInternal::Stream* __is = __out.is();

+    ::IceInternal::Stream* __os = __out.os();

+    __os->write("find");

+    __os->write(object);

+    if (!__out.invoke())

+    {

+	throw ::Ice::UnknownUserException(__FILE__, __LINE__);

+    }

+    ::IcePack::ServerDescriptionPtr __ret;

+    {

+	::Ice::ObjectPtr __obj;

+	__is->read(__obj, ::IcePack::ServerDescription::__classIds[0]);

+	if (!__obj)

+	{

+	    __obj = new ::IcePack::ServerDescription;

+	    __obj->__read(__is);

+	}

+	__ret = ::IcePack::ServerDescriptionPtr::dynamicCast(__obj);

+	if (!__ret)

+	{

+	    throw ::Ice::ValueUnmarshalException(__FILE__, __LINE__);

+	}

+    }

+    return __ret;

+}

+

+void

+IceDelegateM::IcePack::Admin::shutdown()

+{

+    ::IceInternal::Outgoing __out(__emitter(), __reference());

+    ::IceInternal::Stream* __os = __out.os();

+    __os->write("shutdown");

+    if (!__out.invoke())

+    {

+	throw ::Ice::UnknownUserException(__FILE__, __LINE__);

+    }

+}

+

+IcePack::ServerDescriptionPtrE::ServerDescriptionPtrE(const ServerDescriptionPtrE& p)

+{

+    _ptr = p._ptr;

+}

+

+IcePack::ServerDescriptionPtrE::ServerDescriptionPtrE(const ::IcePack::ServerDescriptionPtr& p)

+{

+    _ptr = p;

+}

+

+IcePack::ServerDescriptionPtrE::operator ::IcePack::ServerDescriptionPtr() const

+{

+    return ::IcePack::ServerDescriptionPtr(dynamic_cast< ::IcePack::ServerDescription*>(_ptr.get()));

+}

+

+::IcePack::ServerDescription*

+IcePack::ServerDescriptionPtrE::operator->() const

+{

+    return dynamic_cast< ::IcePack::ServerDescription*>(_ptr.get());

+}

+

+IcePack::ServerDescriptionPrxE::ServerDescriptionPrxE(const ServerDescriptionPrxE& p)

+{

+    _prx = p._prx;

+}

+

+IcePack::ServerDescriptionPrxE::ServerDescriptionPrxE(const ::IcePack::ServerDescriptionPrx& p)

+{

+    _prx = p;

+}

+

+IcePack::ServerDescriptionPrxE::operator ::IcePack::ServerDescriptionPrx() const

+{

+    return ::IcePack::ServerDescriptionPrx(dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(_prx.get()));

+}

+

+::IceProxy::IcePack::ServerDescription*

+IcePack::ServerDescriptionPrxE::operator->() const

+{

+    return dynamic_cast< ::IceProxy::IcePack::ServerDescription*>(_prx.get());

+}

+

+void

+IcePack::ServerDescription::_throw()

+{

+    throw ::IcePack::ServerDescriptionPtrE(this);

+}

+

+std::string IcePack::ServerDescription::__ids[2] =

+{

+    "::Ice::Object",

+    "::IcePack::ServerDescription"

+};

+

+std::string IcePack::ServerDescription::__classIds[2] =

+{

+    "::IcePack::ServerDescription",

+    "::Ice::Object"

+};

+

+bool

+IcePack::ServerDescription::_isA(const std::string& s)

+{

+    std::string* b = __ids;

+    std::string* e = __ids + 2;

+    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);

+    return r.first != r.second;

+}

+

+const std::string*

+IcePack::ServerDescription::_classIds()

+{

+    return __classIds;

+}

+

+void

+IcePack::ServerDescription::__write(::IceInternal::Stream* __os)

+{

+    __os->startWriteEncaps();

+    __os->write(object);

+    __os->write(regex);

+    __os->write(host);

+    __os->write(path);

+    __os->endWriteEncaps();

+}

+

+void

+IcePack::ServerDescription::__read(::IceInternal::Stream* __is)

+{

+    __is->startReadEncaps();

+    __is->read(object);

+    __is->read(regex);

+    __is->read(host);

+    __is->read(path);

+    __is->endReadEncaps();

+}

+

+IcePack::AdminPtrE::AdminPtrE(const AdminPtrE& p)

+{

+    _ptr = p._ptr;

+}

+

+IcePack::AdminPtrE::AdminPtrE(const ::IcePack::AdminPtr& p)

+{

+    _ptr = p;

+}

+

+IcePack::AdminPtrE::operator ::IcePack::AdminPtr() const

+{

+    return ::IcePack::AdminPtr(dynamic_cast< ::IcePack::Admin*>(_ptr.get()));

+}

+

+::IcePack::Admin*

+IcePack::AdminPtrE::operator->() const

+{

+    return dynamic_cast< ::IcePack::Admin*>(_ptr.get());

+}

+

+IcePack::AdminPrxE::AdminPrxE(const AdminPrxE& p)

+{

+    _prx = p._prx;

+}

+

+IcePack::AdminPrxE::AdminPrxE(const ::IcePack::AdminPrx& p)

+{

+    _prx = p;

+}

+

+IcePack::AdminPrxE::operator ::IcePack::AdminPrx() const

+{

+    return ::IcePack::AdminPrx(dynamic_cast< ::IceProxy::IcePack::Admin*>(_prx.get()));

+}

+

+::IceProxy::IcePack::Admin*

+IcePack::AdminPrxE::operator->() const

+{

+    return dynamic_cast< ::IceProxy::IcePack::Admin*>(_prx.get());

+}

+

+void

+IcePack::Admin::_throw()

+{

+    throw ::IcePack::AdminPtrE(this);

+}

+

+std::string IcePack::Admin::__ids[2] =

+{

+    "::Ice::Object",

+    "::IcePack::Admin"

+};

+

+std::string IcePack::Admin::__classIds[2] =

+{

+    "::IcePack::Admin",

+    "::Ice::Object"

+};

+

+bool

+IcePack::Admin::_isA(const std::string& s)

+{

+    std::string* b = __ids;

+    std::string* e = __ids + 2;

+    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);

+    return r.first != r.second;

+}

+

+const std::string*

+IcePack::Admin::_classIds()

+{

+    return __classIds;

+}

+

+::IceInternal::DispatchStatus

+IcePack::Admin::___add(::IceInternal::Incoming& __in)

+{

+    ::IceInternal::Stream* __is = __in.is();

+    ::IcePack::ServerDescriptionPtr description;

+    {

+	::Ice::ObjectPtr __obj;

+	__is->read(__obj, ::IcePack::ServerDescription::__classIds[0]);

+	if (!__obj)

+	{

+	    __obj = new ::IcePack::ServerDescription;

+	    __obj->__read(__is);

+	}

+	description = ::IcePack::ServerDescriptionPtr::dynamicCast(__obj);

+	if (!description)

+	{

+	    throw ::Ice::ValueUnmarshalException(__FILE__, __LINE__);

+	}

+    }

+    add(description);

+    return ::IceInternal::DispatchOK;

+}

+

+::IceInternal::DispatchStatus

+IcePack::Admin::___remove(::IceInternal::Incoming& __in)

+{

+    ::IceInternal::Stream* __is = __in.is();

+    ::Ice::ObjectPrx object;

+    __is->read(object);

+    remove(object);

+    return ::IceInternal::DispatchOK;

+}

+

+::IceInternal::DispatchStatus

+IcePack::Admin::___find(::IceInternal::Incoming& __in)

+{

+    ::IceInternal::Stream* __is = __in.is();

+    ::IceInternal::Stream* __os = __in.os();

+    ::Ice::ObjectPrx object;

+    __is->read(object);

+    ::IcePack::ServerDescriptionPtr __ret = find(object);

+    {

+	::Ice::ObjectPtr __obj = __ret;

+	__os->write(__obj);

+    }

+    return ::IceInternal::DispatchOK;

+}

+

+::IceInternal::DispatchStatus

+IcePack::Admin::___shutdown(::IceInternal::Incoming& __in)

+{

+    shutdown();

+    return ::IceInternal::DispatchOK;

+}

+

+std::string IcePack::Admin::__names[6] =

+{

+    "_isA",

+    "_ping",

+    "add",

+    "find",

+    "remove",

+    "shutdown"

+};

+

+::IceInternal::DispatchStatus

+IcePack::Admin::__dispatch(::IceInternal::Incoming& in, const std::string& s)

+{

+    std::string* b = __names;

+    std::string* e = __names + 6;

+    std::pair<std::string*, std::string*> r = std::equal_range(b, e, s);

+    if (r.first == r.second)

+    {

+	return ::IceInternal::DispatchOperationNotExist;

+    }

+

+    switch (r.first - __names)

+    {

+	case 0:

+	{

+	    return ____isA(in);

+	}

+	case 1:

+	{

+	    return ____ping(in);

+	}

+	case 2:

+	{

+	    return ___add(in);

+	}

+	case 3:

+	{

+	    return ___find(in);

+	}

+	case 4:

+	{

+	    return ___remove(in);

+	}

+	case 5:

+	{

+	    return ___shutdown(in);

+	}

+    }

+

+    assert(false);

+    return ::IceInternal::DispatchOperationNotExist;

+}

+

+void

+IcePack::Admin::__write(::IceInternal::Stream* __os)

+{

+    __os->startWriteEncaps();

+    __os->endWriteEncaps();

+}

+

+void

+IcePack::Admin::__read(::IceInternal::Stream* __is)

+{

+    __is->startReadEncaps();

+    __is->endReadEncaps();

+}

diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index 0c0f90f22a8..5951e9eae7a 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.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_API_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_PACK_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"

@@ -53,11 +53,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/ice001.dll"

+# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/icepack001.dll" /libpath:"../../../lib"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy Release\ice001.* ..\..\lib

+PostBuild_Cmds=copy Release\icepack001.* ..\..\lib

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

@@ -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_API_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_PACK_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"

@@ -84,11 +84,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 jtcd.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice001d.dll" /pdbtype:sept

+# ADD LINK32 jtcd.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepack001d.dll" /pdbtype:sept /libpath:"../../../lib"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy Debug\ice001d.* ..\..\lib

+PostBuild_Cmds=copy Debug\icepack001d.* ..\..\lib

 # End Special Build Tool

 

 !ENDIF 

@@ -102,171 +102,7 @@ PostBuild_Cmds=copy Debug\ice001d.* ..\..\lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Collector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Communicator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CommunicatorI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Emitter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Endpoint.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\EventHandler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Incoming.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Instance.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LocalException.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LocalObject.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Logger.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\LoggerI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Network.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectAdapter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectAdapterFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectAdapterI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Outgoing.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Pickler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PicklerI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Properties.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertiesI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Proxy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ProxyFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Reference.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Shared.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\SslAcceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\SslConnector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\SslTransceiver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Stream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TcpAcceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TcpConnector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TcpTransceiver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ThreadPool.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TraceLevels.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TraceUtil.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Transceiver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UdpTransceiver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactoryManager.cpp

+SOURCE=.\Admin.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -274,295 +110,11 @@ SOURCE=.\ValueFactoryManager.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\IcePack\Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\AcceptorF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Buffer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Collector.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\CollectorF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Communicator.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\CommunicatorF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\CommunicatorI.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Config.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ConnectorF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Emitter.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\EmitterF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Endpoint.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\EndpointF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\EventHandler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\EventHandlerF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Functional.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Handle.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\IcePack.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Incoming.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Initialize.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Instance.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\InstanceF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\LocalException.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\LocalObject.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\LocalObjectF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Logger.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\LoggerF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\LoggerI.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Native.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Network.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Object.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ObjectAdapter.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ObjectAdapterF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ObjectAdapterFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ObjectAdapterFactoryF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ObjectAdapterI.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ObjectF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Outgoing.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Pickler.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\PicklerF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\PicklerI.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Properties.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\PropertiesF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\PropertiesI.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Proxy.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ProxyF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ProxyFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ProxyFactoryF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ProxyHandle.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Reference.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ReferenceF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Shared.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\SslAcceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\SslConnector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\SslTransceiver.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\Stream.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TcpAcceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TcpConnector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TcpTransceiver.h

+SOURCE=..\..\include\IcePack\Admin.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IcePack\ThreadPool.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ThreadPoolF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TraceLevels.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TraceLevelsF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TraceUtil.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\Transceiver.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\TransceiverF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\UdpTransceiver.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IcePack\ValueFactoryF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ValueFactoryManager.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IcePack\ValueFactoryManagerF.h

+SOURCE=..\..\include\IcePack\AdminF.h

 # End Source File

 # End Group

 # Begin Group "Resource Files"

@@ -570,421 +122,41 @@ SOURCE=.\IcePack\ValueFactoryManagerF.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

-SOURCE=..\..\slice\IcePack\Communicator.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Communicator.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Communicator.ice \

-	move Communicator.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Communicator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Communicator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Communicator.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Communicator.ice \

-	move Communicator.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Communicator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Communicator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\CommunicatorF.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\CommunicatorF.ice

-

-"..\..\include\IcePack\CommunicatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/CommunicatorF.ice 

-	move CommunicatorF.h ..\..\include\IcePack 

-	del CommunicatorF.cpp 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\CommunicatorF.ice

-

-"..\..\include\IcePack\CommunicatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/CommunicatorF.ice 

-	move CommunicatorF.h ..\..\include\IcePack 

-	del CommunicatorF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\Logger.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Logger.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Logger.ice \

-	move Logger.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Logger.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Logger.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Logger.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Logger.ice \

-	move Logger.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Logger.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Logger.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\LoggerF.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\LoggerF.ice

-

-"..\..\include\IcePack\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/LoggerF.ice 

-	move LoggerF.h ..\..\include\IcePack 

-	del LoggerF.cpp 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\LoggerF.ice

-

-"..\..\include\IcePack\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/LoggerF.ice 

-	move LoggerF.h ..\..\include\IcePack 

-	del LoggerF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\ObjectAdapter.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\ObjectAdapter.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ObjectAdapter.ice \

-	move ObjectAdapter.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\ObjectAdapter.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ObjectAdapter.ice \

-	move ObjectAdapter.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\ObjectAdapterF.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\ObjectAdapterF.ice

-

-"..\..\include\IcePack\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ObjectAdapterF.ice 

-	move ObjectAdapterF.h ..\..\include\IcePack 

-	del ObjectAdapterF.cpp 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\ObjectAdapterF.ice

-

-"..\..\include\IcePack\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ObjectAdapterF.ice 

-	move ObjectAdapterF.h ..\..\include\IcePack 

-	del ObjectAdapterF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\Pickler.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Pickler.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Pickler.ice \

-	move Pickler.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Pickler.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Pickler.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Pickler.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Pickler.ice \

-	move Pickler.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Pickler.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Pickler.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\PicklerF.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\PicklerF.ice

-

-"..\..\include\IcePack\PicklerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/PicklerF.ice 

-	move PicklerF.h ..\..\include\IcePack 

-	del PicklerF.cpp 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\PicklerF.ice

-

-"..\..\include\IcePack\PicklerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/PicklerF.ice 

-	move PicklerF.h ..\..\include\IcePack 

-	del PicklerF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\Properties.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Properties.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Properties.ice \

-	move Properties.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\Properties.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/Properties.ice \

-	move Properties.h ..\..\include\IcePack \

-	

-

-"..\..\include\IcePack\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\PropertiesF.ice

-

-!IF  "$(CFG)" == "IcePack - Win32 Release"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\PropertiesF.ice

-

-"..\..\include\IcePack\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/PropertiesF.ice 

-	move PropertiesF.h ..\..\include\IcePack 

-	del PropertiesF.cpp 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

-

-# Begin Custom Build

-InputPath=..\..\slice\IcePack\PropertiesF.ice

-

-"..\..\include\IcePack\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/PropertiesF.ice 

-	move PropertiesF.h ..\..\include\IcePack 

-	del PropertiesF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\IcePack\ValueFactory.ice

+SOURCE=..\..\slice\IcePack\Admin.ice

 

 !IF  "$(CFG)" == "IcePack - Win32 Release"

 

 # Begin Custom Build

-InputPath=..\..\slice\IcePack\ValueFactory.ice

+InputPath=..\..\slice\IcePack\Admin.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ValueFactory.ice \

-	move ValueFactory.h ..\..\include\IcePack \

+	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir IcePack -I../../slice ../../slice/IcePack/Admin.ice \

+	move Admin.h ..\..\include\IcePack \

 	

 

-"..\..\include\IcePack\ValueFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\IcePack\Admin.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"ValueFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Admin.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

 

 # Begin Custom Build

-InputPath=..\..\slice\IcePack\ValueFactory.ice

+InputPath=..\..\slice\IcePack\Admin.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ValueFactory.ice \

-	move ValueFactory.h ..\..\include\IcePack \

+	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir IcePack -I../../slice ../../slice/IcePack/Admin.ice \

+	move Admin.h ..\..\include\IcePack \

 	

 

-"..\..\include\IcePack\ValueFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\IcePack\Admin.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"ValueFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Admin.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -993,31 +165,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\IcePack\ValueFactoryF.ice

+SOURCE=..\..\slice\IcePack\AdminF.ice

 

 !IF  "$(CFG)" == "IcePack - Win32 Release"

 

 # Begin Custom Build

-InputPath=..\..\slice\IcePack\ValueFactoryF.ice

+InputPath=..\..\slice\IcePack\AdminF.ice

 

-"..\..\include\IcePack\ValueFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\IcePack\AdminF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

 	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ValueFactoryF.ice 

-	move ValueFactoryF.h ..\..\include\IcePack 

-	del ValueFactoryF.cpp 

+	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir IcePack -I../../slice ../../slice/IcePack/AdminF.ice 

+	move AdminF.h ..\..\include\IcePack 

+	del AdminF.cpp 

 	

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

 

 # Begin Custom Build

-InputPath=..\..\slice\IcePack\ValueFactoryF.ice

+InputPath=..\..\slice\IcePack\AdminF.ice

 

-"..\..\include\IcePack\ValueFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\IcePack\AdminF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

 	set PATH=%PATH%;..\..\lib 

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir IcePack -I../../slice ../../slice/IcePack/ValueFactoryF.ice 

-	move ValueFactoryF.h ..\..\include\IcePack 

-	del ValueFactoryF.cpp 

+	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir IcePack -I../../slice ../../slice/IcePack/AdminF.ice 

+	move AdminF.h ..\..\include\IcePack 

+	del AdminF.cpp 

 	

 # End Custom Build

 

diff --git a/cpp/src/IcePack/icepackC.dsp b/cpp/src/IcePack/icepackC.dsp
new file mode 100644
index 00000000000..f8e199ca93c
--- /dev/null
+++ b/cpp/src/IcePack/icepackC.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="IcePackC" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=IcePackC - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "IcePackC.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "IcePackC.mak" CFG="IcePackC - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "IcePackC - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "IcePackC - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "IcePackC - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"icepackadmin.exe" /libpath:"../../../lib"

+

+!ELSEIF  "$(CFG)" == "IcePackC - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 jtcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"icepackadmin.exe" /pdbtype:sept /libpath:"../../../lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "IcePackC - Win32 Release"

+# Name "IcePackC - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\Client.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/cpp/src/IcePack/icepackS.dsp b/cpp/src/IcePack/icepackS.dsp
new file mode 100644
index 00000000000..b45dca310f0
--- /dev/null
+++ b/cpp/src/IcePack/icepackS.dsp
@@ -0,0 +1,118 @@
+# Microsoft Developer Studio Project File - Name="IcePackS" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=IcePackS - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "IcePackS.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "IcePackS.mak" CFG="IcePackS - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "IcePackS - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "IcePackS - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "IcePackS - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 jtc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"icepack.exe" /libpath:"../../../lib"

+

+!ELSEIF  "$(CFG)" == "IcePackS - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 jtcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /out:"icepack.exe" /pdbtype:sept /libpath:"../../../lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "IcePackS - Win32 Release"

+# Name "IcePackS - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\AdminI.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forward.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\AdminI.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Forward.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/cpp/src/Slice/parser.dsp b/cpp/src/Slice/parser.dsp
index eddcec43ccb..192684cce81 100644
--- a/cpp/src/Slice/parser.dsp
+++ b/cpp/src/Slice/parser.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 "PARSER_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../../include" /I "dummyinclude" /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" /I "dummyinclude" /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\slice001.* ..\..\..\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 "PARSER_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../../../include" /I "dummyinclude" /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" /I "dummyinclude" /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"

@@ -122,7 +122,7 @@ SOURCE=.\Scanner.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\library\Shared.cpp

+SOURCE=..\..\Ice\Shared.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"