Removed protobuf demos

35 files changed, 0 insertions, 2086 deletions

diff --git a/protobuf/demo/cpp/.depend.mak b/protobuf/demo/cpp/.depend.mak
deleted file mode 100644
index b0b51596e11..00000000000
--- a/protobuf/demo/cpp/.depend.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-Hello$(OBJEXT): Hello.cpp Hello.h "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointIF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/Ice/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/Direct.h" Person.pb.h StreamProtobuf.h "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/StatsF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/IceUtil/Unicode.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Stats.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" "$(ice_cpp_dir)/include/Ice/IconvStringConverter.h"
-Person.pb$(OBJEXT): Person.pb.cpp Person.pb.h
-Client$(OBJEXT): Client.cpp "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/Ice/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/StatsF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/IceUtil/Unicode.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointIF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Stats.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" "$(ice_cpp_dir)/include/Ice/IconvStringConverter.h" Hello.h Person.pb.h StreamProtobuf.h
-HelloI$(OBJEXT): HelloI.cpp "$(ice_cpp_dir)/include/IceUtil/IceUtil.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/IceUtil/AbstractMutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/Cache.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/IceUtil/CountDownLatch.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/CtrlCHandler.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/MutexPtrLock.h" "$(ice_cpp_dir)/include/IceUtil/RecMutex.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/UUID.h" "$(ice_cpp_dir)/include/IceUtil/Unicode.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/Ice/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/StatsF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointIF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Stats.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" "$(ice_cpp_dir)/include/Ice/IconvStringConverter.h" HelloI.h Hello.h Person.pb.h StreamProtobuf.h
-Server$(OBJEXT): Server.cpp "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/Ice/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/StatsF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/IceUtil/Unicode.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointIF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Stats.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" "$(ice_cpp_dir)/include/Ice/IconvStringConverter.h" HelloI.h Hello.h Person.pb.h StreamProtobuf.h
-Hello$(OBJEXT): Hello.cpp Hello.h "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/IceUtil/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/IceUtil/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/Direct.h" Person.pb.h StreamProtobuf.h "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/DeprecatedStringConverter.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/NativePropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h"
-Person.pb$(OBJEXT): Person.pb.cpp Person.pb.h
-Client$(OBJEXT): Client.cpp "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/DeprecatedStringConverter.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/IceUtil/UndefSysMacros.h" "$(ice_cpp_dir)/include/IceUtil/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/NativePropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" Hello.h Person.pb.h StreamProtobuf.h
-HelloI$(OBJEXT): HelloI.cpp "$(ice_cpp_dir)/include/IceUtil/IceUtil.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/IceUtil/AbstractMutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/Cache.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/IceUtil/CountDownLatch.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/CtrlCHandler.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/MutexPtrLock.h" "$(ice_cpp_dir)/include/IceUtil/RecMutex.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/IceUtil/StringConverter.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/UUID.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/IceUtil/IconvStringConverter.h" "$(ice_cpp_dir)/include/IceUtil/UndefSysMacros.h" "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/Ice/DeprecatedStringConverter.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/NativePropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" HelloI.h Hello.h Person.pb.h StreamProtobuf.h
-Server$(OBJEXT): Server.cpp "$(ice_cpp_dir)/include/Ice/Ice.h" "$(ice_cpp_dir)/include/Ice/Config.h" "$(ice_cpp_dir)/include/IceUtil/Config.h" "$(ice_cpp_dir)/include/Ice/DeprecatedStringConverter.h" "$(ice_cpp_dir)/include/Ice/CommunicatorF.h" "$(ice_cpp_dir)/include/Ice/ProxyF.h" "$(ice_cpp_dir)/include/IceUtil/Shared.h" "$(ice_cpp_dir)/include/Ice/ProxyHandle.h" "$(ice_cpp_dir)/include/IceUtil/Handle.h" "$(ice_cpp_dir)/include/IceUtil/Exception.h" "$(ice_cpp_dir)/include/Ice/ObjectF.h" "$(ice_cpp_dir)/include/Ice/Handle.h" "$(ice_cpp_dir)/include/Ice/Exception.h" "$(ice_cpp_dir)/include/Ice/Format.h" "$(ice_cpp_dir)/include/Ice/StreamF.h" "$(ice_cpp_dir)/include/Ice/LocalObject.h" "$(ice_cpp_dir)/include/Ice/LocalObjectF.h" "$(ice_cpp_dir)/include/Ice/StreamHelpers.h" "$(ice_cpp_dir)/include/IceUtil/ScopedArray.h" "$(ice_cpp_dir)/include/IceUtil/Iterator.h" "$(ice_cpp_dir)/include/IceUtil/Optional.h" "$(ice_cpp_dir)/include/IceUtil/UndefSysMacros.h" "$(ice_cpp_dir)/include/IceUtil/StringConverter.h" "$(ice_cpp_dir)/include/Ice/Initialize.h" "$(ice_cpp_dir)/include/Ice/PropertiesF.h" "$(ice_cpp_dir)/include/Ice/Proxy.h" "$(ice_cpp_dir)/include/IceUtil/Mutex.h" "$(ice_cpp_dir)/include/IceUtil/Lock.h" "$(ice_cpp_dir)/include/IceUtil/ThreadException.h" "$(ice_cpp_dir)/include/IceUtil/Time.h" "$(ice_cpp_dir)/include/IceUtil/MutexProtocol.h" "$(ice_cpp_dir)/include/Ice/ProxyFactoryF.h" "$(ice_cpp_dir)/include/Ice/ConnectionIF.h" "$(ice_cpp_dir)/include/Ice/RequestHandlerF.h" "$(ice_cpp_dir)/include/Ice/EndpointF.h" "$(ice_cpp_dir)/include/Ice/EndpointTypes.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapterF.h" "$(ice_cpp_dir)/include/Ice/ReferenceF.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsync.h" "$(ice_cpp_dir)/include/IceUtil/Monitor.h" "$(ice_cpp_dir)/include/IceUtil/Cond.h" "$(ice_cpp_dir)/include/IceUtil/Timer.h" "$(ice_cpp_dir)/include/IceUtil/Thread.h" "$(ice_cpp_dir)/include/IceUtil/UniquePtr.h" "$(ice_cpp_dir)/include/Ice/OutgoingAsyncF.h" "$(ice_cpp_dir)/include/Ice/InstanceF.h" "$(ice_cpp_dir)/include/Ice/Current.h" "$(ice_cpp_dir)/include/Ice/ConnectionF.h" "$(ice_cpp_dir)/include/Ice/Identity.h" "$(ice_cpp_dir)/include/Ice/Version.h" "$(ice_cpp_dir)/include/Ice/BasicStream.h" "$(ice_cpp_dir)/include/Ice/Object.h" "$(ice_cpp_dir)/include/Ice/GCShared.h" "$(ice_cpp_dir)/include/Ice/GCCountMap.h" "$(ice_cpp_dir)/include/Ice/IncomingAsyncF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryF.h" "$(ice_cpp_dir)/include/Ice/ObjectFactoryManagerF.h" "$(ice_cpp_dir)/include/Ice/Buffer.h" "$(ice_cpp_dir)/include/Ice/Protocol.h" "$(ice_cpp_dir)/include/Ice/SlicedDataF.h" "$(ice_cpp_dir)/include/Ice/UserExceptionFactory.h" "$(ice_cpp_dir)/include/Ice/FactoryTable.h" "$(ice_cpp_dir)/include/Ice/ObserverHelper.h" "$(ice_cpp_dir)/include/Ice/Instrumentation.h" "$(ice_cpp_dir)/include/Ice/LoggerF.h" "$(ice_cpp_dir)/include/Ice/InstrumentationF.h" "$(ice_cpp_dir)/include/Ice/Dispatcher.h" "$(ice_cpp_dir)/include/Ice/BuiltinSequences.h" "$(ice_cpp_dir)/include/Ice/Plugin.h" "$(ice_cpp_dir)/include/Ice/LocalException.h" "$(ice_cpp_dir)/include/Ice/PropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Outgoing.h" "$(ice_cpp_dir)/include/Ice/Incoming.h" "$(ice_cpp_dir)/include/Ice/ServantLocatorF.h" "$(ice_cpp_dir)/include/Ice/ServantManagerF.h" "$(ice_cpp_dir)/include/Ice/IncomingAsync.h" "$(ice_cpp_dir)/include/Ice/Direct.h" "$(ice_cpp_dir)/include/Ice/Properties.h" "$(ice_cpp_dir)/include/Ice/Logger.h" "$(ice_cpp_dir)/include/Ice/LoggerUtil.h" "$(ice_cpp_dir)/include/Ice/Communicator.h" "$(ice_cpp_dir)/include/Ice/RouterF.h" "$(ice_cpp_dir)/include/Ice/LocatorF.h" "$(ice_cpp_dir)/include/Ice/PluginF.h" "$(ice_cpp_dir)/include/Ice/ImplicitContextF.h" "$(ice_cpp_dir)/include/Ice/CommunicatorAsync.h" "$(ice_cpp_dir)/include/Ice/ObjectFactory.h" "$(ice_cpp_dir)/include/Ice/ObjectAdapter.h" "$(ice_cpp_dir)/include/Ice/FacetMap.h" "$(ice_cpp_dir)/include/Ice/Endpoint.h" "$(ice_cpp_dir)/include/Ice/ServantLocator.h" "$(ice_cpp_dir)/include/Ice/SlicedData.h" "$(ice_cpp_dir)/include/Ice/Process.h" "$(ice_cpp_dir)/include/Ice/Application.h" "$(ice_cpp_dir)/include/Ice/Connection.h" "$(ice_cpp_dir)/include/Ice/ConnectionAsync.h" "$(ice_cpp_dir)/include/Ice/Functional.h" "$(ice_cpp_dir)/include/IceUtil/Functional.h" "$(ice_cpp_dir)/include/Ice/Stream.h" "$(ice_cpp_dir)/include/Ice/ImplicitContext.h" "$(ice_cpp_dir)/include/Ice/Locator.h" "$(ice_cpp_dir)/include/Ice/FactoryTableInit.h" "$(ice_cpp_dir)/include/Ice/ProcessF.h" "$(ice_cpp_dir)/include/Ice/Router.h" "$(ice_cpp_dir)/include/Ice/DispatchInterceptor.h" "$(ice_cpp_dir)/include/Ice/NativePropertiesAdmin.h" "$(ice_cpp_dir)/include/Ice/Metrics.h" "$(ice_cpp_dir)/include/Ice/Service.h" HelloI.h Hello.h Person.pb.h StreamProtobuf.h
diff --git a/protobuf/demo/cpp/.gitignore b/protobuf/demo/cpp/.gitignore
deleted file mode 100644
index 0c7a711fcec..00000000000
--- a/protobuf/demo/cpp/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-client
-server
-Hello.cpp
-Hello.h
-Person.pb.cpp
-Person.pb.h
diff --git a/protobuf/demo/cpp/Client.cpp b/protobuf/demo/cpp/Client.cpp
deleted file mode 100644
index c927cf36394..00000000000
--- a/protobuf/demo/cpp/Client.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <Hello.h>
-
-using namespace std;
-using namespace Demo;
-
-class HelloClient : public Ice::Application
-{
-public:
-
-    HelloClient();
-
-    virtual int run(int, char*[]);
-
-private:
-
-    void menu();
-};
-
-int
-main(int argc, char* argv[])
-{
-    HelloClient app;
-    return app.main(argc, argv, "config.client");
-}
-
-HelloClient::HelloClient() :
-    //
-    // Since this is an interactive demo we don't want any signal
-    // handling.
-    //
-    Ice::Application(Ice::NoSignalHandling)
-{
-}
-
-int
-HelloClient::run(int argc, char* argv[])
-{
-    if(argc > 1)
-    {
-        cerr << appName() << ": too many arguments" << endl;
-        return EXIT_FAILURE;
-    }
-
-    HelloPrx hello = HelloPrx::checkedCast(communicator()->propertyToProxy("Hello.Proxy"));
-    if(!hello)
-    {
-        cerr << argv[0] << ": invalid proxy" << endl;
-        return EXIT_FAILURE;
-    }
-
-    tutorial::Person p;
-    p.set_id(1);
-    p.set_name("Fred Jones");
-    p.set_email("fred@jones.com");
-
-    menu();
-
-    char c;
-    do
-    {
-        try
-        {
-            cout << "==> ";
-            cin >> c;
-            if(c == 't')
-            {
-                hello->sayHello(p);
-            }
-            else if(c == 's')
-            {
-                hello->shutdown();
-            }
-            else if(c == 'x')
-            {
-                // Nothing to do
-            }
-            else if(c == '?')
-            {
-                menu();
-            }
-            else
-            {
-                cout << "unknown command `" << c << "'" << endl;
-                menu();
-            }
-        }
-        catch(const Ice::Exception& ex)
-        {
-            cerr << ex << endl;
-        }
-    }
-    while(cin.good() && c != 'x');
-
-    return EXIT_SUCCESS;
-}
-
-void
-HelloClient::menu()
-{
-    cout <<
-        "usage:\n"
-        "t: send greeting\n"
-        "s: shutdown server\n"
-        "x: exit\n"
-        "?: help\n";
-}
diff --git a/protobuf/demo/cpp/Hello.ice b/protobuf/demo/cpp/Hello.ice
deleted file mode 100644
index 68f4711f806..00000000000
--- a/protobuf/demo/cpp/Hello.ice
+++ /dev/null
@@ -1,30 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-[["cpp:include:Person.pb.h"]]
-[["cpp:include:StreamProtobuf.h"]]
-
-module Demo
-{
-
-["cpp:type:tutorial::Person"] sequence<byte> Person;
-
-interface Hello
-{
-    idempotent void sayHello(Person p);
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/protobuf/demo/cpp/HelloI.cpp b/protobuf/demo/cpp/HelloI.cpp
deleted file mode 100644
index 3fa20c7c319..00000000000
--- a/protobuf/demo/cpp/HelloI.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <HelloI.h>
-
-using namespace std;
-
-void
-HelloI::sayHello(const tutorial::Person& p, const Ice::Current&)
-{
-    cout << "Hello World from " << p.DebugString() << endl;
-}
-
-void
-HelloI::shutdown(const Ice::Current& c)
-{
-    cout << "Shutting down..." << endl;
-    c.adapter->getCommunicator()->shutdown();
-}
diff --git a/protobuf/demo/cpp/HelloI.h b/protobuf/demo/cpp/HelloI.h
deleted file mode 100644
index 4a475b51d12..00000000000
--- a/protobuf/demo/cpp/HelloI.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_I_H
-#define HELLO_I_H
-
-#include <Hello.h>
-
-class HelloI : public Demo::Hello
-{
-public:
-
-    virtual void sayHello(const tutorial::Person& p, const Ice::Current&);
-    virtual void shutdown(const Ice::Current&);
-};
-
-#endif
diff --git a/protobuf/demo/cpp/Ice.protobuf.client.vcxproj b/protobuf/demo/cpp/Ice.protobuf.client.vcxproj
deleted file mode 100755
index 908c0df5361..00000000000
--- a/protobuf/demo/cpp/Ice.protobuf.client.vcxproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Hello.ice" />
-    <CustomBuild Include="Person.proto">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">protoc --cpp_out=. Person.proto
-move Person.pb.cc Person.pb.cpp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)%(Filename).pb.h;$(ProjectDir)%(Filename).pb.cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)%(Filename).pb.h;$(ProjectDir)%(Filename).pb.cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">protoc --cpp_out=. Person.proto
-move Person.pb.cc Person.pb.cpp</Command>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Client.cpp" />
-    <ClCompile Include="generated\Hello.cpp" />
-    <ClCompile Include="Person.pb.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="generated\Hello.h" />
-    <ClInclude Include="Person.pb.h" />
-    <ClInclude Include="StreamProtobuf.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{606BCE06-A612-4019-95EE-F863672E09D8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Iceprotobufclient</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <ExecutablePath>$(IceBin);$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(IceInclude);$(IncludePath)</IncludePath>
-    <LibraryPath>$(IceLib);$(LibraryPath)</LibraryPath>
-    <TargetName>client</TargetName>
-    <OutDir>$(SolutionDir)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <ExecutablePath>$(IceBin);$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(IceInclude);$(IncludePath)</IncludePath>
-    <LibraryPath>$(IceLib);$(LibraryPath)</LibraryPath>
-    <TargetName>client</TargetName>
-    <OutDir>$(SolutionDir)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>iced.lib;iceutild.lib;libprotobufd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ice.lib;iceutil.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_OutputDir="generated" ZerocIce_ProjectVersion="1" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/protobuf/demo/cpp/Ice.protobuf.server.vcxproj b/protobuf/demo/cpp/Ice.protobuf.server.vcxproj
deleted file mode 100755
index dabfe458865..00000000000
--- a/protobuf/demo/cpp/Ice.protobuf.server.vcxproj
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Hello.ice" />
-    <CustomBuild Include="Person.proto">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">protoc --cpp_out=. Person.proto
-move Person.pb.cc Person.pb.cpp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)%(Filename).pb.h;$(ProjectDir)%(Filename).pb.cpp</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)%(Filename).pb.h;$(ProjectDir)%(Filename).pb.cpp</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">protoc --cpp_out=. Person.proto
-move Person.pb.cc Person.pb.cpp</Command>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="HelloI.cpp" />
-    <ClCompile Include="Server.cpp" />
-    <ClCompile Include="generated\Hello.cpp" />
-    <ClCompile Include="Person.pb.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="generated\Hello.h" />
-    <ClInclude Include="HelloI.h" />
-    <ClInclude Include="Person.pb.h" />
-    <ClInclude Include="StreamProtobuf.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C8629E21-7608-429E-8EA4-07398AD75BDB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Iceprotobufserver</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ALLUSERSPROFILE)\ZeroC\Ice.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <ExecutablePath>$(IceBin);$(ExecutablePath);C:\pb-2.5.0\bin</ExecutablePath>
-    <IncludePath>$(IceInclude);$(IncludePath);C:\pb-2.5.0\include</IncludePath>
-    <LibraryPath>$(IceLib);$(LibraryPath);C:\pb-2.5.0\lib</LibraryPath>
-    <TargetName>server</TargetName>
-    <OutDir>$(SolutionDir)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <ExecutablePath>$(IceBin);$(ExecutablePath);C:\pb-2.5.0\bin</ExecutablePath>
-    <IncludePath>$(IceInclude);$(IncludePath);C:\pb-2.5.0\include</IncludePath>
-    <LibraryPath>$(IceLib);$(LibraryPath);C:\pb-2.5.0\lib</LibraryPath>
-    <TargetName>server</TargetName>
-    <OutDir>$(SolutionDir)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>iced.lib;iceutild.lib;libprotobufd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ice.lib;iceutil.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_OutputDir="generated" ZerocIce_ProjectVersion="1" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/protobuf/demo/cpp/Ice.protobuf.sln b/protobuf/demo/cpp/Ice.protobuf.sln
deleted file mode 100755
index 67cdaa740a5..00000000000
--- a/protobuf/demo/cpp/Ice.protobuf.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ice.protobuf.client", "Ice.protobuf.client.vcxproj", "{606BCE06-A612-4019-95EE-F863672E09D8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ice.protobuf.server", "Ice.protobuf.server.vcxproj", "{C8629E21-7608-429E-8EA4-07398AD75BDB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{606BCE06-A612-4019-95EE-F863672E09D8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{606BCE06-A612-4019-95EE-F863672E09D8}.Debug|Win32.Build.0 = Debug|Win32
-		{606BCE06-A612-4019-95EE-F863672E09D8}.Release|Win32.ActiveCfg = Release|Win32
-		{606BCE06-A612-4019-95EE-F863672E09D8}.Release|Win32.Build.0 = Release|Win32
-		{C8629E21-7608-429E-8EA4-07398AD75BDB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8629E21-7608-429E-8EA4-07398AD75BDB}.Debug|Win32.Build.0 = Debug|Win32
-		{C8629E21-7608-429E-8EA4-07398AD75BDB}.Release|Win32.ActiveCfg = Release|Win32
-		{C8629E21-7608-429E-8EA4-07398AD75BDB}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/protobuf/demo/cpp/Makefile b/protobuf/demo/cpp/Makefile
deleted file mode 100644
index c90a42d7c95..00000000000
--- a/protobuf/demo/cpp/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice Protobuf is licensed to you under the terms
-# described in the ICE_PROTOBUF_LICENSE file included in this
-# distribution.
-#
-# **********************************************************************
-
-#
-# If protobuf is not installed in a standard location where the
-# compiler can find it, set PROTOBUF_HOME to the protobuf installation
-# directory.
-#
-PROTOBUF_HOME   ?= /usr/local
-
-top_srcdir	= ../..
-
-CLIENT		= client
-SERVER		= server
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-OBJS		= Hello.o \
-		  Person.pb.o
-
-COBJS		= Client.o
-
-SOBJS		= HelloI.o \
-		  Server.o
-
-SRCS		= $(OBJS:.o=.cpp) \
-		  $(COBJS:.o=.cpp) \
-		  $(SOBJS:.o=.cpp)
-
-SLICE_SRCS	= Hello.ice
-PROTO_SRCS	= Person.proto
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= $(ICE_FLAGS) -I$(PROTOBUF_HOME)/include -I. $(CPPFLAGS)
-LIBS		:= $(ICE_LIB_DIR) $(LIBS) -L$(PROTOBUF_HOME)/lib -lprotobuf
-
-$(CLIENT): $(OBJS) $(COBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS)
-
-$(SERVER): $(OBJS) $(SOBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
-
-%..pb.h %.pb.cpp: %.proto
-	rm -f $(*F).pb.h $(*F).pb.cpp
-	$(PROTOBUF_HOME)/bin/protoc --cpp_out=. $(*F).proto
-	mv $(*F).pb.cc $(*F).pb.cpp
-
-depend::
-	for i in $(PROTO_SRCS); do \
-		echo "$${i%.proto}.pb.cpp: $$i" >> .depend; \
-	done
-
-clean::
-	rm -f $(addsuffix .pb.cpp, $(basename $(notdir $(PROTO_SRCS))))
-	rm -f $(addsuffix .pb.h, $(basename $(notdir $(PROTO_SRCS))))
-
-include .depend
diff --git a/protobuf/demo/cpp/Makefile.mak b/protobuf/demo/cpp/Makefile.mak
deleted file mode 100644
index 2215ab3bb22..00000000000
--- a/protobuf/demo/cpp/Makefile.mak
+++ /dev/null
@@ -1,77 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice Protobuf is licensed to you under the terms
-# described in the ICE_PROTOBUF_LICENSE file included in this
-# distribution.
-#
-# **********************************************************************
-
-#
-# If protobuf is not installed in a standard location where the
-# compiler can find it, set PROTOBUF_HOME to the protobuf installation
-# directory.
-#
-!if "$(PROTOBUF_HOME)" == ""
-PROTOBUF_HOME   = c:\protobuf
-!endif
-
-top_srcdir	= ..\..
-
-CLIENT		= client.exe
-SERVER		= server.exe
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-OBJS		= Hello.obj \
-		  Person.pb.obj
-
-COBJS		= Client.obj
-
-SOBJS		= HelloI.obj \
-		  Server.obj
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(COBJS:.obj=.cpp) \
-		  $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-#
-# Need to use -W0 to get rid of ugly warnings from generated protobuf file as
-# well as prevent compile failure on x64 due to warnings from protobuf headers
-#
-CPPFLAGS	= $(ICE_CPPFLAGS) -I$(PROTOBUF_HOME)\include -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -W0
-
-LIBS		= $(ICE_LDFLAGS) $(LIBS) /libpath:$(PROTOBUF_HOME)\lib libprotobuf$(LIBSUFFIX).lib
-
-!if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS) $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(SERVER): $(OBJS) $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-# A generic rule would be nicer, but since protoc generates .pb.cpp
-# it is not possible with nmake.
-Person.pb.cpp: Person.proto
-	del /q Person.pb.h Person.pb.cpp
-	$(PROTOBUF_HOME)\bin\protoc --cpp_out=. Person.proto
-	move Person.pb.cc Person.pb.cpp
-
-Person.pb.h: Person.pb.cpp
-
-clean::
-	del /q Hello.cpp Hello.h
-	del /q Person.pb.h Person.pb.cpp
-
-!include .depend
diff --git a/protobuf/demo/cpp/Person.proto b/protobuf/demo/cpp/Person.proto
deleted file mode 100644
index 25a56ac7c78..00000000000
--- a/protobuf/demo/cpp/Person.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-package tutorial;
-
-message Person {
-    required int32 id = 1;
-    required string name = 2;
-    optional string email = 3;
-}
diff --git a/protobuf/demo/cpp/README b/protobuf/demo/cpp/README
deleted file mode 100644
index b341a2f6cea..00000000000
--- a/protobuf/demo/cpp/README
+++ /dev/null
@@ -1,117 +0,0 @@
-Introduction
-------------
-
-This demo shows how to integrate Google Protocol Buffers with Ice.
-
-The Protocol Buffers distribution and documentation can be found at
-
-  http://code.google.com/apis/protocolbuffers/
-
-This demo was tested with Protocol Buffers version 2.5.0.
-
-The Slice-to-C++ compiler, slice2cpp, supports metadata that allows
-you to specify an alternate mapping for a sequence<byte> type. The
-generated code uses the type name you supply in place of the sequence
-name. There are two prerequisites: you must add a metadata directive
-to include the header file containing the definition of your alternate
-type, and you must supply code that Ice can use to marshal and
-unmarshal instances of your alternate type.
-
-For example, here is a metadata directive that specifies an alternate
-type name for a byte sequence:
-
-  ["cpp:type:tutorial::Person"] sequence<byte> Person;
-
-The type name specified in this example, tutorial::Person, corresponds
-to the C++ class generated by the Protocol Buffers compiler (protoc)
-for the definition shown below:
-
-  package tutorial;
-  message Person { ... };
-
-We must also add the following metadata directive before any other
-Slice definitions to ensure the definition of tutorial::Person is
-visible:
-
-  [["cpp:include:Person.pb.h"]]
-
-Finally, we need to define the marshaling code. The header file
-StreamProtobuf.h in this directory contains template definitions that
-can be used with any Protocol Buffer message types. We also need to
-include this code using a cpp:include metadata directive.
-
-Refer to Hello.ice in this directory for the complete example.
-
-
-Building the demo on Linux/OS X/Unix
-------------------------------------
-
-If you are using a non-RPM install or have not installed Ice in the
-default location (/opt/Ice-VERSION) then you will need to set the
-environment variable ICE_HOME to point to the root directory of your
-Ice installation:
-
-  $ export ICE_HOME=<Ice installation root directory>
-
-Please review the Makefile in this directory and adjust the value
-of PROTOBUF_HOME to reflect the installation directory of Protocol
-Buffers on your system.
-
-Use this command to build the demo:
-
-  $ make (or gmake depending on system)
-
-
-Building the demo on Windows
-----------------------------
-
-For Windows, Visual Studio project files are provided for building the
-demo. These projects require the Ice Visual Studio Add-In, which is
-installed automatically by the Ice installer.
-
-Open the Ice.protobuf.sln solution. For each project, open the project
-properties and modify the VC++ Directories. You will need to add the
-Protocol Buffers bin directory to "Executable Directories", the
-include directory to "Include Directories", and the lib directory to
-"Library Directories".
-
-Next, select the target configuration (Debug or Release), right-click
-on the solution in the Solution Explorer window and select
-"Build Solution".
-
-Note that on Windows the Protocol Buffers source package does not
-support automatic installation. The build system for this demo
-assumes that you have compiled and manually installed Protocol Buffers
-using the following directory structure:
-
-%PROTOBUF_HOME%\bin
-
-    Contains protoc.exe
-
-%PROTOBUF_HOME%\lib
-
-    Contains libprotobuf.lib and libprotobufd.lib, the release and
-    debug static libraries, respectively. (The debug library was
-    renamed to libprotobufd.lib.)
-
-%PROTOBUF_HOME%\include
-
-    Contains the output of the extract_includes.bat batch file that
-    copies the include files contained in the Protocol Buffers
-    distribution.
-
-
-Running the demo
-----------------
-
-First you must ensure that your environment is set up to run Ice
-applications. Please see the documentation that came with your Ice
-distribution for more information.
-
-To run the demo, first start the server:
-
-  $ server
-
-In a separate window, start the client:
-
-  $ client
diff --git a/protobuf/demo/cpp/Server.cpp b/protobuf/demo/cpp/Server.cpp
deleted file mode 100644
index 100e9592cb2..00000000000
--- a/protobuf/demo/cpp/Server.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <HelloI.h>
-
-using namespace std;
-
-class HelloServer : public Ice::Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
-int
-main(int argc, char* argv[])
-{
-    HelloServer app;
-    return app.main(argc, argv, "config.server");
-}
-
-int
-HelloServer::run(int argc, char* argv[])
-{
-    if(argc > 1)
-    {
-        cerr << appName() << ": too many arguments" << endl;
-        return EXIT_FAILURE;
-    }
-
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Hello");
-    Demo::HelloPtr hello = new HelloI;
-    adapter->add(hello, communicator()->stringToIdentity("hello"));
-    adapter->activate();
-    communicator()->waitForShutdown();
-    return EXIT_SUCCESS;
-}
diff --git a/protobuf/demo/cpp/StreamProtobuf.h b/protobuf/demo/cpp/StreamProtobuf.h
deleted file mode 100644
index 1efa3f4f171..00000000000
--- a/protobuf/demo/cpp/StreamProtobuf.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#ifndef STREAM_PROTOBUF_H
-#define STREAM_PROTOBUF_H
-
-#include <Ice/Ice.h>
-#include <google/protobuf/message_lite.h>
-
-#ifdef ICE_CPP11
-#include <type_traits>
-#endif
-
-//
-// Tell Ice how to marshal and unmarshal a protobuf message to/from a sequence<byte>
-//
-namespace Ice
-{
-
-#ifdef ICE_CPP11
-//
-// We'll use std::enable_if to give protobuf its own helper category (see below)
-//
-const StreamHelperCategory StreamHelperCategoryProtobuf = 100;
-#else
-//
-// We just assume a single "custom" category: Unknown
-//
-const StreamHelperCategory StreamHelperCategoryProtobuf = StreamHelperCategoryUnknown;
-#endif
-
-#ifdef ICE_CPP11
-
-template<typename T>
-struct StreamableTraits<T, typename std::enable_if<std::is_base_of< ::google::protobuf::MessageLite, T>::value >::type>
-{
-    static const StreamHelperCategory helper = StreamHelperCategoryProtobuf;
-    static const int minWireSize = 1;
-    static const bool fixedLength = false;
-};
-
-#else
-//
-// We use the default 'Unknown' StreamHelperCategory
-//
-#endif
-
-template<typename T>
-struct StreamHelper<T, StreamHelperCategoryProtobuf>
-{
-    template<class S> static inline void
-    write(S* stream, const ::google::protobuf::MessageLite& v)
-    {
-        std::vector<Byte> data(v.ByteSize());
-        if(!v.IsInitialized())
-        {
-            throw MarshalException(__FILE__, __LINE__,
-                                   "message not fully initialized: " + v.InitializationErrorString());
-        }
-
-        Byte* r = v.SerializeWithCachedSizesToArray(&data[0]);
-        if(r != &data[0] + data.size())
-        {
-            throw MarshalException(__FILE__, __LINE__, "message modified during marshaling");
-        }
-
-        stream->write(&data[0], &data[0] + data.size());
-    }
-
-    template<class S> static inline void
-    read(S* stream, ::google::protobuf::MessageLite& v)
-    {
-        std::pair<const Byte*, const Byte*> data;
-        stream->read(data);
-        if(!v.ParseFromArray(data.first, static_cast<int>(data.second - data.first)))
-        {
-            throw MarshalException(__FILE__, __LINE__, "ParseFromArray failed");
-        }
-    }
-};
-
-//
-// Use default marshaling/unmarshaling, with optionalFormat = OptionalFormatVSize
-//
-template<>
-struct GetOptionalFormat<StreamHelperCategoryProtobuf, 1, false>
-{
-    static const OptionalFormat value = OptionalFormatVSize;
-};
-
-}
-#endif
diff --git a/protobuf/demo/cpp/config.client b/protobuf/demo/cpp/config.client
deleted file mode 100644
index a02cab0f4cb..00000000000
--- a/protobuf/demo/cpp/config.client
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# The client reads this property to create the reference to the
-# "hello" object in the server.
-#
-Hello.Proxy=hello:tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/protobuf/demo/cpp/config.server b/protobuf/demo/cpp/config.server
deleted file mode 100644
index 309db9731b2..00000000000
--- a/protobuf/demo/cpp/config.server
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# The server creates one single object adapter with the name
-# "Hello". The following line sets the endpoints for this
-# adapter.
-#
-Hello.Endpoints=tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/protobuf/demo/java/Client.java b/protobuf/demo/java/Client.java
deleted file mode 100644
index c7eea4ac588..00000000000
--- a/protobuf/demo/java/Client.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class Client extends Ice.Application
-{
-    class ShutdownHook extends Thread
-    {
-        public void
-        run()
-        {
-            try
-            {
-                communicator().destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
-
-    private static void
-    menu()
-    {
-        System.out.println(
-            "usage:\n" +
-            "t: send greeting\n" +
-            "s: shutdown server\n" +
-            "x: exit\n" +
-            "?: help\n");
-    }
-
-    public int
-    run(String[] args)
-    {
-        if(args.length > 0)
-        {
-            System.err.println(appName() + ": too many arguments");
-            return 1;
-        }
-
-        //
-        // Since this is an interactive demo we want to clear the
-        // Application installed interrupt callback and install our
-        // own shutdown hook.
-        //
-        setInterruptHook(new ShutdownHook());
-
-        HelloPrx hello = HelloPrxHelper.checkedCast(communicator().propertyToProxy("Hello.Proxy"));
-        if(hello == null)
-        {
-            System.err.println("invalid proxy");
-            return 1;
-        }
-
-        tutorial.PersonPB.Person p = tutorial.PersonPB.Person.newBuilder().
-            setId(1).setName("Fred Jones").setEmail("fred@jones.com").build();
-
-        menu();
-
-        java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
-
-        String line = null;
-        do
-        {
-            try
-            {
-                System.out.print("==> ");
-                System.out.flush();
-                line = in.readLine();
-                if(line == null)
-                {
-                    break;
-                }
-                if(line.equals("t"))
-                {
-                    hello.sayHello(p);
-                }
-                else if(line.equals("s"))
-                {
-                    hello.shutdown();
-                }
-                else if(line.equals("x"))
-                {
-                    // Nothing to do
-                }
-                else if(line.equals("?"))
-                {
-                    menu();
-                }
-                else
-                {
-                    System.out.println("unknown command `" + line + "'");
-                    menu();
-                }
-            }
-            catch(java.io.IOException ex)
-            {
-                ex.printStackTrace();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-        while(!line.equals("x"));
-
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int status = app.main("Client", args, "config.client");
-        System.exit(status);
-    }
-}
diff --git a/protobuf/demo/java/Hello.ice b/protobuf/demo/java/Hello.ice
deleted file mode 100644
index a36ed3e7e0f..00000000000
--- a/protobuf/demo/java/Hello.ice
+++ /dev/null
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-["java:protobuf:tutorial.PersonPB.Person"] sequence<byte> Person;
-
-interface Hello
-{
-    idempotent void sayHello(Person p);
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/protobuf/demo/java/HelloI.java b/protobuf/demo/java/HelloI.java
deleted file mode 100644
index 39319da6db9..00000000000
--- a/protobuf/demo/java/HelloI.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class HelloI extends _HelloDisp
-{
-    public void
-    sayHello(tutorial.PersonPB.Person p, Ice.Current current)
-    {
-        System.out.println("Hello World from " + p);
-    }
-
-    public void
-    shutdown(Ice.Current current)
-    {
-        System.out.println("Shutting down...");
-        current.adapter.getCommunicator().shutdown();
-    }
-}
diff --git a/protobuf/demo/java/Person.proto b/protobuf/demo/java/Person.proto
deleted file mode 100644
index acada853424..00000000000
--- a/protobuf/demo/java/Person.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-package tutorial;
-
-option java_outer_classname = "PersonPB";
-
-message Person {
-    required int32 id = 1;
-    required string name = 2;
-    optional string email = 3;
-}
diff --git a/protobuf/demo/java/README b/protobuf/demo/java/README
deleted file mode 100644
index 979dfb31523..00000000000
--- a/protobuf/demo/java/README
+++ /dev/null
@@ -1,86 +0,0 @@
-Introduction
-------------
-
-This demo shows how to integrate Google Protocol Buffers with Ice.
-
-The Protocol Buffers distribution and documentation can be found at
-
-  http://code.google.com/apis/protocolbuffers/
-
-This demo was tested with Protocol Buffers version 2.5.0.
-
-Ice supports metadata that makes it possible for you to specify
-Protocol Buffers message types in your Slice definitions, with Ice
-handling the serialization chores for you automatically. The metadata,
-which may only be used on a sequence<byte> type, has the following
-syntax in Java:
-
-  java:protobuf:protoc-generated-class
-
-For example:
-
-  ["java:protobuf:tutorial.PersonPB.Person"] sequence<byte> Person;
-
-The type name specified in this example, tutorial.PersonPB.Person,
-corresponds to the Java class generated by the Protocol Buffers
-compiler (protoc) for the definition shown below:
-
-  package tutorial;
-  option java_outer_classname = "PersonPB";
-  message Person { ... };
-
-
-Building the demo
------------------
-
-This demo uses an ant build task, located in the "ant" subdirectory,
-for compiling .proto files.
-
-Building the demo requires Ant 1.7.0 or greater, which can be
-downloaded at:
-
-  http://ant.apache.org/bindownload.cgi
-
-If you are using a non-RPM install on Unix or have not installed Ice
-in the default location (/opt/Ice-VERSION on Unix or C:\Ice-VERSION on
-Windows) then you will need to set the environment variable ICE_HOME
-to point to the root directory of your Ice installation. For example,
-on Unix:
-
-  $ export ICE_HOME=<Ice installation root directory>
-
-Or on Windows:
-
-  > set ICE_HOME=<Ice installation root directory>
-
-Prior to building the demo, you should also add protoc to your PATH
-and protobuf-java-2.5.0.jar to your CLASSPATH.
-
-Use this command to build the demo:
-
-  $ ant
-
-
-Running the demo
-----------------
-
-First you must ensure that your environment is set up to run Ice
-applications. Please see the documentation that came with your Ice
-distribution for more information. You will also need to add the
-classes directory to your CLASSPATH.
-
-Unix:
-
-  $ export CLASSPATH=$CLASSPATH:classes
-
-Windows:
-
-  > set CLASSPATH=%CLASSPATH%;classes
-
-To run the demo, first start the server:
-
-  $ java Server
-
-In a separate window, start the client:
-
-  $ java Client
diff --git a/protobuf/demo/java/Server.java b/protobuf/demo/java/Server.java
deleted file mode 100644
index 7bf228cdc12..00000000000
--- a/protobuf/demo/java/Server.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class Server extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        if(args.length > 0)
-        {
-            System.err.println(appName() + ": too many arguments");
-            return 1;
-        }
-
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
-        adapter.add(new HelloI(), communicator().stringToIdentity("hello"));
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int status = app.main("Server", args, "config.server");
-        System.exit(status);
-    }
-}
diff --git a/protobuf/demo/java/ant/ProtocTask.java b/protobuf/demo/java/ant/ProtocTask.java
deleted file mode 100644
index 3bc27d35a7f..00000000000
--- a/protobuf/demo/java/ant/ProtocTask.java
+++ /dev/null
@@ -1,371 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-//package Ice.Ant;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.taskdefs.ExecTask;
-import org.apache.tools.ant.taskdefs.Execute;
-import org.apache.tools.ant.taskdefs.PumpStreamHandler;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Commandline.Argument;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.StringReader;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-
-/**
- * An ant task for protoc.
- *
- * Attributes specific to protoc:
- *
- *   translator - The pathname of the translator (default: "protoc").
- *   protocpath - The value for the --proto_path translator option.
- *   outputdir - The value for the --java_out translator option.
- *   dependencyfile - The file in which dependencies are stored (default: ".pbdepend").
- *
- * Example:
- *
- *    <project ...>
- *        <taskdef name="protoc" classname="ProtocTask" />
- *        <property name="protoc.dir" value="../include/protoc"/>
- *        <target name="generate">
- *            <mkdir dir="tags" />
- *            <protoc tagdir="tags" outputdir="out">
- *                <fileset dir="${protoc.dir}">
- *                    <include name="*.ice" />
- *                </fileset>
- *            </protoc>
- *        </target>
- *    </project>
- *
- * The <taskdef> element installs the protoctask task.
- */
-public class ProtocTask extends org.apache.tools.ant.Task
-{
-    public
-    ProtocTask()
-    {
-        _translator = null;
-        _outputDir = null;
-        _protocPath = null;
-        _outputDirString = null;
-    }
-
-    public void
-    setDependencyFile(File file)
-    {
-        _dependencyFile = file;
-    }
-
-    public void
-    setOutputdir(File dir)
-    {
-        _outputDir = dir;
-        _outputDirString = _outputDir.toString();
-        if(_outputDirString.indexOf(' ') != -1)
-        {
-            _outputDirString = '"' + _outputDirString + '"';
-        }
-    }
-
-    public void
-    setProtocpath(File dir)
-    {
-        _protocPath = dir.toString();
-    }
-
-    public void
-    setTranslator(File prog)
-    {
-        _translator = prog;
-    }
-
-    public FileSet
-    createFileset()
-    {
-        FileSet fileset = new FileSet();
-        _fileSets.add(fileset);
-
-        return fileset;
-    }
-
-    @SuppressWarnings("unchecked")
-    public void
-    execute()
-        throws BuildException
-    {
-        if(_fileSets.isEmpty())
-        {
-            throw new BuildException("No fileset specified");
-        }
-
-        //
-        // Read the set of dependencies for this task.
-        //
-        java.util.HashMap dependencies = readDependencies();
-
-        //
-        // Compose a list of the files that need to be translated. A
-        // file needs to translated if we can't find a dependency in
-        // the dependency table or if its dependency is not up-to-date
-        // anymore (the proto file changed since the dependency was
-        // last updated)
-        //
-        java.util.Vector<File> buildList = new java.util.Vector<File>();
-        java.util.Vector<File> skipList = new java.util.Vector<File>();
-        java.util.Iterator p = _fileSets.iterator();
-        while(p.hasNext())
-        {
-            FileSet fileset = (FileSet)p.next();
-
-            DirectoryScanner scanner = fileset.getDirectoryScanner(getProject());
-            scanner.scan();
-            String[] files = scanner.getIncludedFiles();
-            for(int i = 0; i < files.length; i++)
-            {
-                File proto = new File(fileset.getDir(getProject()), files[i]);
-
-                ProtoDependency depend = (ProtoDependency)dependencies.get(getTargetKey(proto.toString()));
-                if(depend == null || !depend.isUpToDate())
-                {
-                    buildList.addElement(proto);
-                }
-                else
-                {
-                    skipList.addElement(proto);
-                }
-            }
-
-            java.util.Iterator i = skipList.iterator();
-            while(i.hasNext())
-            {
-                File file = (File)i.next();
-                log("skipping " + file.getName());
-            }
-        }
-
-        //
-        // Run the translator
-        //
-        if(!buildList.isEmpty())
-        {
-            String translator;
-            if(_translator == null)
-            {
-                translator = "protoc";
-            }
-            else
-            {
-                translator = _translator.toString();
-            }
-
-            StringBuilder cmd = new StringBuilder(128);
-
-            //
-            // Add --java_out.
-            //
-            if(_outputDir != null)
-            {
-                cmd.append(" --java_out=");
-                cmd.append(stripDriveLetter(_outputDirString));
-            }
-
-            //
-            // Add --proto_path
-            //
-            if(_protocPath != null)
-            {
-                cmd.append(" --proto_path=");
-                cmd.append(stripDriveLetter(_protocPath));
-            }
-
-            //
-            // Add files to be translated
-            //
-            for(int i = 0; i < buildList.size(); i++)
-            {
-                File f = (File)buildList.elementAt(i);
-                cmd.append(" ");
-                String s = stripDriveLetter(f.toString());
-                if(s.indexOf(' ') != -1)
-                {
-                    cmd.append('"');
-                    cmd.append(s);
-                    cmd.append('"');
-                }
-                else
-                {
-                    cmd.append(s);
-                }
-            }
-
-            //
-            // Execute
-            //
-            log(translator + " " + cmd);
-            ExecTask task = (ExecTask)getProject().createTask("exec");
-            task.setFailonerror(true);
-            Argument arg = task.createArg();
-            arg.setLine(cmd.toString());
-            task.setExecutable(translator);
-            task.execute();
-
-            //
-            // Update dependency file.
-            //
-            for(int i = 0; i < buildList.size(); i++)
-            {
-                ProtoDependency depend = new ProtoDependency();
-                depend._timeStamp = new java.util.Date().getTime();
-                depend._dependency = ((File)buildList.elementAt(i)).toString();
-                dependencies.put(getTargetKey(depend._dependency), depend);
-            }
-
-            writeDependencies(dependencies);
-        }
-    }
-
-    private String
-    getTargetKey(String proto)
-    {
-        //
-        // Since the dependency file can be shared by several proto
-        // tasks we need to make sure that each dependency has a
-        // unique key. We use the name of the task, the output
-        // directory and the name of the proto file to be compiled.
-        //
-        // If there's two protoc tasks using the same dependency
-        // file, with the same output dir and which compiles the same
-        // protoc file they'll use the same dependency.
-        //
-        return "protoc " + _outputDir.toString() + " " + proto;
-    }
-
-    // This is to work around a bug with protoc, where it does not
-    // accept drive letters in path names. See
-    // http://bugzilla/bugzilla/show_bug.cgi?id=3349
-    //
-    private String
-    stripDriveLetter(String s)
-    {
-        if(s.length() > 1 && s.charAt(1) == ':')
-        {
-            return s.substring(2);
-        }
-        return s;
-    }
-
-    //
-    // Read the dependency file.
-    //
-    private java.util.HashMap
-    readDependencies()
-    {
-        if(_dependencyFile == null)
-        {
-            if(_outputDir != null)
-            {
-                _dependencyFile = new File(_outputDir, ".pbdepend");
-            }
-            else
-            {
-                _dependencyFile = new File(".pbdepend");
-            }
-        }
-
-        try
-        {
-            java.io.ObjectInputStream in = new java.io.ObjectInputStream(new java.io.FileInputStream(_dependencyFile));
-            java.util.HashMap dependencies = (java.util.HashMap)in.readObject();
-            in.close();
-            return dependencies;
-        }
-        catch(java.io.IOException ex)
-        {
-        }
-        catch(java.lang.ClassNotFoundException ex)
-        {
-        }
-
-        return new java.util.HashMap();
-    }
-
-    private void
-    writeDependencies(java.util.HashMap dependencies)
-    {
-        try
-        {
-            java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(new FileOutputStream(_dependencyFile));
-            out.writeObject(dependencies);
-            out.close();
-        }
-        catch(java.io.IOException ex)
-        {
-            throw new BuildException("Unable to write dependencies in file " + _dependencyFile.getPath() + ": " + ex);
-        }
-    }
-
-    //
-    // A proto dependency.
-    //
-    // * the _timeStamp attribute contains the last time the proto
-    //   file was compiled.
-    //
-    // * the _dependency attribute contains the .proto file.
-    //
-    private class ProtoDependency implements java.io.Serializable
-    {
-        private void writeObject(java.io.ObjectOutputStream out)
-            throws java.io.IOException
-        {
-            out.writeObject(_dependency);
-            out.writeLong(_timeStamp);
-        }
-
-        private void readObject(java.io.ObjectInputStream in)
-            throws java.io.IOException, java.lang.ClassNotFoundException
-        {
-            _dependency = (String)in.readObject();
-            _timeStamp = in.readLong();
-        }
-
-        public boolean
-        isUpToDate()
-        {
-            File dep = new File(_dependency);
-            if(!dep.exists() || _timeStamp < dep.lastModified())
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        public String _dependency;
-        public long _timeStamp;
-    }
-
-    private File _translator;
-    private File _dependencyFile;
-    private File _outputDir;
-    private String _outputDirString;
-    private String _protocPath;
-    private java.util.List<FileSet> _fileSets = new java.util.LinkedList<FileSet>();
-}
diff --git a/protobuf/demo/java/build.xml b/protobuf/demo/java/build.xml
deleted file mode 100644
index 7b5a79c6942..00000000000
--- a/protobuf/demo/java/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-
- This copy of Ice Protobuf is licensed to you under the terms described
- in the ICE_PROTOBUF_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<project name="demo_Ice_protobuf" default="all" basedir=".">
-
-    <!-- set global properties for this build -->
-    <property name="top.dir" value="../.."/>
-
-    <!-- import common definitions -->
-    <import file="${top.dir}/config/common.xml"/>
-
-    <target name="protoc" depends="init">
-        <!-- Build protoc task -->
-        <mkdir dir="${class.dir}"/>
-        <javac srcdir="ant" destdir="${class.dir}" debug="${debug}">
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-    </target>
-
-    <target name="generate" depends="protoc">
-        <!-- Add the protoc task -->
-        <taskdef name="protoc" classpath="${class.dir}" classname="ProtocTask" />
-        <!-- Create the output directory for generated code -->
-        <mkdir dir="${generated.dir}"/>
-        <slice2java outputdir="${generated.dir}">
-	    <meta value="${java2metadata}"/>
-            <fileset dir="." includes="Hello.ice"/>
-        </slice2java>
-        <protoc outputdir="${generated.dir}" protocpath=".">
-            <fileset dir="." includes="Person.proto"/>
-        </protoc>
-    </target>
-
-    <target name="compile" depends="generate">
-        <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**, ant/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-    </target>
-
-    <target name="all" depends="compile"/>
-
-    <target name="clean">
-        <delete dir="${generated.dir}"/>
-        <delete dir="${class.dir}"/>
-    </target>
-
-</project>
diff --git a/protobuf/demo/java/config.client b/protobuf/demo/java/config.client
deleted file mode 100644
index a02cab0f4cb..00000000000
--- a/protobuf/demo/java/config.client
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# The client reads this property to create the reference to the
-# "hello" object in the server.
-#
-Hello.Proxy=hello:tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/protobuf/demo/java/config.server b/protobuf/demo/java/config.server
deleted file mode 100644
index 309db9731b2..00000000000
--- a/protobuf/demo/java/config.server
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# The server creates one single object adapter with the name
-# "Hello". The following line sets the endpoints for this
-# adapter.
-#
-Hello.Endpoints=tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/protobuf/demo/python/Client.py b/protobuf/demo/python/Client.py
deleted file mode 100644
index ca79c2de5d4..00000000000
--- a/protobuf/demo/python/Client.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice Protobuf is licensed to you under the terms
-# described in the ICE_PROTOBUF_LICENSE file included in this
-# distribution.
-#
-# **********************************************************************
-
-import sys, traceback, Ice
-
-Ice.loadSlice('Hello.ice')
-import Demo
-from Person_pb2 import Person
-
-def menu():
-    print """
-usage:
-t: send greeting
-s: shutdown server
-x: exit
-?: help
-"""
-
-class Client(Ice.Application):
-    def run(self, args):
-        if len(args) > 1:
-            print self.appName() + ": too many arguments"
-            return 1
-
-        hello = Demo.HelloPrx.checkedCast(self.communicator().propertyToProxy('Hello.Proxy'))
-        if not hello:
-            print args[0] + ": invalid proxy"
-            return 1
-
-        menu()
-
-        p = Person()
-        p.id = 1
-        p.name = "Fred Jones"
-        p.email = "fred@jones.com"
-
-        c = None
-        while c != 'x':
-            try:
-                c = raw_input("==> ")
-                if c == 't':
-                    hello.sayHello(p)
-                elif c == 's':
-                    hello.shutdown()
-                elif c == 'x':
-                    pass # Nothing to do
-                elif c == '?':
-                    menu()
-                else:
-                    print "unknown command `" + c + "'"
-                    menu()
-            except KeyboardInterrupt:
-                break
-            except EOFError:
-                break
-            except Ice.Exception, ex:
-                print ex
-
-        return 0
-
-app = Client()
-sys.exit(app.main(sys.argv, "config.client"))
diff --git a/protobuf/demo/python/Hello.ice b/protobuf/demo/python/Hello.ice
deleted file mode 100644
index 87f5c320df6..00000000000
--- a/protobuf/demo/python/Hello.ice
+++ /dev/null
@@ -1,28 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-["python:protobuf:Person_pb2.Person"] sequence<byte> Person;
-
-interface Hello
-{
-    idempotent void sayHello(Person p);
-    void shutdown();
-};
-
-};
-
-
-#endif
diff --git a/protobuf/demo/python/Person.proto b/protobuf/demo/python/Person.proto
deleted file mode 100644
index 25a56ac7c78..00000000000
--- a/protobuf/demo/python/Person.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice Protobuf is licensed to you under the terms
-// described in the ICE_PROTOBUF_LICENSE file included in this
-// distribution.
-//
-// **********************************************************************
-
-package tutorial;
-
-message Person {
-    required int32 id = 1;
-    required string name = 2;
-    optional string email = 3;
-}
diff --git a/protobuf/demo/python/Person_pb2.py b/protobuf/demo/python/Person_pb2.py
deleted file mode 100644
index 5cde5d220b0..00000000000
--- a/protobuf/demo/python/Person_pb2.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: Person.proto
-
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='Person.proto',
-  package='tutorial',
-  serialized_pb='\n\x0cPerson.proto\x12\x08tutorial\"1\n\x06Person\x12\n\n\x02id\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x02(\t\x12\r\n\x05\x65mail\x18\x03 \x01(\t')
-
-
-
-
-_PERSON = _descriptor.Descriptor(
-  name='Person',
-  full_name='tutorial.Person',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='id', full_name='tutorial.Person.id', index=0,
-      number=1, type=5, cpp_type=1, label=2,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='name', full_name='tutorial.Person.name', index=1,
-      number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='email', full_name='tutorial.Person.email', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  serialized_start=26,
-  serialized_end=75,
-)
-
-DESCRIPTOR.message_types_by_name['Person'] = _PERSON
-
-class Person(_message.Message):
-  __metaclass__ = _reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _PERSON
-
-  # @@protoc_insertion_point(class_scope:tutorial.Person)
-
-
-# @@protoc_insertion_point(module_scope)
diff --git a/protobuf/demo/python/README b/protobuf/demo/python/README
deleted file mode 100644
index a71cc17b2e3..00000000000
--- a/protobuf/demo/python/README
+++ /dev/null
@@ -1,50 +0,0 @@
-Introduction
-------------
-
-This demo shows how to integrate Google Protocol Buffers with Ice.
-
-The Protocol Buffers distribution and documentation can be found at
-
-  http://code.google.com/apis/protocolbuffers/
-
-This demo was tested with Protocol Buffers version 2.5.0.
-
-Ice supports metadata that makes it possible for you to specify
-Protocol Buffers message types in your Slice definitions, with Ice
-handling the serialization chores for you automatically. The metadata,
-which may only be used on a sequence<byte> type, has the following
-syntax in Python:
-
-  python:protobuf:protoc-generated-class
-
-For example:
-
-  ["python:protobuf:Person_pb2.Person"] sequence<byte> Person;
-
-The type name specified in this example, Person_pb2.Person,
-corresponds to the Python class generated by the Protocol Buffers
-compiler (protoc) for the definition shown below:
-
-  package tutorial;
-  message Person { ... };
-
-Prior to running the demo, you must generate the Python code for
-Person.proto by running the following command:
-
-  $ protoc --python_out=. Person.proto
-
-
-Running the demo
-----------------
-
-First you must ensure that your environment is set up to run Ice
-applications. Please see the documentation that came with your Ice
-distribution for more information.
-
-To run the demo, first start the server:
-
-  $ python Server.py
-
-In a separate window, start the client:
-
-  $ python Client.py
diff --git a/protobuf/demo/python/Server.py b/protobuf/demo/python/Server.py
deleted file mode 100644
index 3ffa8174a68..00000000000
--- a/protobuf/demo/python/Server.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice Protobuf is licensed to you under the terms
-# described in the ICE_PROTOBUF_LICENSE file included in this
-# distribution.
-#
-# **********************************************************************
-
-import sys, traceback, time, Ice
-
-Ice.loadSlice('Hello.ice')
-import Demo
-from Person_pb2 import Person
-
-class HelloI(Demo.Hello):
-    def sayHello(self, p, current=None):
-        print "Hello World from %s" % str(p)
-
-    def shutdown(self, current=None):
-        current.adapter.getCommunicator().shutdown()
-
-class Server(Ice.Application):
-    def run(self, args):
-        if len(args) > 1:
-            print self.appName() + ": too many arguments"
-            return 1
-
-        adapter = self.communicator().createObjectAdapter("Hello")
-        adapter.add(HelloI(), self.communicator().stringToIdentity("hello"))
-        adapter.activate()
-        self.communicator().waitForShutdown()
-        return 0
-
-sys.stdout.flush()
-app = Server()
-sys.exit(app.main(sys.argv, "config.server"))
diff --git a/protobuf/demo/python/config.client b/protobuf/demo/python/config.client
deleted file mode 100644
index a02cab0f4cb..00000000000
--- a/protobuf/demo/python/config.client
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# The client reads this property to create the reference to the
-# "hello" object in the server.
-#
-Hello.Proxy=hello:tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/protobuf/demo/python/config.server b/protobuf/demo/python/config.server
deleted file mode 100644
index 309db9731b2..00000000000
--- a/protobuf/demo/python/config.server
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# The server creates one single object adapter with the name
-# "Hello". The following line sets the endpoints for this
-# adapter.
-#
-Hello.Endpoints=tcp -p 10000
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1