http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1842 - Remove extra service demos from non-C++

137 files changed, 18 insertions, 4935 deletions

diff --git a/cs/demo/IceGrid/Makefile b/cs/demo/IceGrid/Makefile
index 1c8f380c224..aff1e24f9c6 100644
--- a/cs/demo/IceGrid/Makefile
+++ b/cs/demo/IceGrid/Makefile
@@ -11,9 +11,7 @@ top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= simple \
-		  sessionActivation \
-		  allocate
+SUBDIRS		= simple
 
 $(EVERYTHING)::
 	@for subdir in $(SUBDIRS); \
diff --git a/cs/demo/IceGrid/Makefile.mak b/cs/demo/IceGrid/Makefile.mak
index e06bc5dcc5b..cb0189b5eb9 100755
--- a/cs/demo/IceGrid/Makefile.mak
+++ b/cs/demo/IceGrid/Makefile.mak
@@ -11,9 +11,7 @@ top_srcdir	= ..\..
 
 !include $(top_srcdir)\config\Make.rules.mak.cs
 
-SUBDIRS		= simple \
-		  sessionActivation \
-		  allocate
+SUBDIRS		= simple
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/cs/demo/IceGrid/README b/cs/demo/IceGrid/README
index da1160e9052..2586cd2df62 100644
--- a/cs/demo/IceGrid/README
+++ b/cs/demo/IceGrid/README
@@ -1,13 +1,5 @@
 Demos in this directory:
 
-- allocate
-
-  This demo shows how to use the allocation feature of IceGrid.
-
-- sessionActivation
-
-  This demo shows the use of the session activation mode.
-
 - simple
 
   This demo illustrates the basics of using IceGrid, including the 
diff --git a/cs/demo/IceGrid/allocate/.depend b/cs/demo/IceGrid/allocate/.depend
deleted file mode 100644
index d36db71ec3d..00000000000
--- a/cs/demo/IceGrid/allocate/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Hello.cs: ./Hello.ice
diff --git a/cs/demo/IceGrid/allocate/.gitignore b/cs/demo/IceGrid/allocate/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/cs/demo/IceGrid/allocate/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/cs/demo/IceGrid/allocate/Client.cs b/cs/demo/IceGrid/allocate/Client.cs
deleted file mode 100644
index 7d3b8792e08..00000000000
--- a/cs/demo/IceGrid/allocate/Client.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Threading;
-using Demo;
-
-
-public class Client : Ice.Application
-{
-    class SessionKeepAliveThread 
-    {
-        public SessionKeepAliveThread(IceGrid.SessionPrx session, int timeout)
-        {
-            _session = session;
-            _timeout = timeout;
-            _terminated = false;
-        }
-
-        public void run()
-        {
-            lock(this)
-            {
-                while(!_terminated)
-                {
-                    System.Threading.Monitor.Wait(this, _timeout);
-                    if(_terminated)
-                    {
-                        break;
-                    }
-                    try
-                    {
-                        _session.keepAlive();
-                    }
-                    catch(Ice.LocalException)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        public void terminate()
-        {
-            lock(this)
-            {
-                _terminated = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        private IceGrid.SessionPrx _session;
-        private int _timeout;
-        private bool _terminated;
-    }
-
-    private void menu()
-    {
-        Console.Out.WriteLine(
-            "usage:\n" +
-            "t: send greeting\n" +
-            "s: shutdown server\n" +
-            "x: exit\n" +
-            "?: help\n");
-    }
-
-    public override int run(string[] args)
-    {
-        int status = 0;
-        IceGrid.RegistryPrx registry = 
-            IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
-        if(registry == null)
-        {
-            Console.WriteLine("could not contact registry");
-            return 1;
-        }
-
-        
-        IceGrid.SessionPrx session = null;
-        while(true)
-        {
-            Console.Out.WriteLine("This demo accepts any user-id / password combination.");
-
-            string id;
-            Console.Out.Write("user id: ");
-            Console.Out.Flush();
-            id = Console.In.ReadLine();
-
-            string pw;
-            Console.Out.Write("password: ");
-            Console.Out.Flush();
-            pw = Console.In.ReadLine();
-
-            try
-            {
-                session = registry.createSession(id, pw);
-                break;
-            }
-            catch(IceGrid.PermissionDeniedException ex)
-            {
-                Console.WriteLine("permission denied:\n" + ex.reason);
-            }
-        }
-
-        SessionKeepAliveThread keepAlive = new SessionKeepAliveThread(session, (int)registry.getSessionTimeout() / 2);
-        Thread keepAliveThread = new Thread(new ThreadStart(keepAlive.run));
-        keepAliveThread.Start();
-
-        try
-        {
-            HelloPrx hello;
-            try
-            {
-                hello = HelloPrxHelper.checkedCast(
-                    session.allocateObjectById(communicator().stringToIdentity("hello")));
-            }
-            catch(IceGrid.ObjectNotRegisteredException)
-            {
-                hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"));
-            }
-
-            menu();
-
-            string line = null;
-            do
-            {
-                try
-                {
-                    Console.Write("==> ");
-                    Console.Out.Flush();
-                    line = Console.In.ReadLine();
-                    if(line == null)
-                    {
-                        break;
-                    }
-                    if(line.Equals("t"))
-                    {
-                        hello.sayHello();
-                    }
-                    else if(line.Equals("s"))
-                    {
-                        hello.shutdown();
-                    }
-                    else if(line.Equals("x"))
-                    {
-                        // Nothing to do
-                    }
-                    else if(line.Equals("?"))
-                    {
-                        menu();
-                    }
-                    else
-                    {
-                        Console.WriteLine("unknown command `" + line + "'");
-                        menu();
-                    }
-                }
-                catch(Ice.LocalException ex)
-                {
-                    Console.WriteLine(ex);
-                }
-            }
-            while(!line.Equals("x"));
-        }
-        catch(IceGrid.AllocationException ex)
-        {
-            Console.WriteLine("could not allocate object: " + ex.reason);
-            status = 1;
-        }
-        catch(Exception ex)
-        {
-            Console.WriteLine("expected exception: " + ex);
-            status = 1;
-        }
-        
-        //
-        // Destroy the keepAlive thread and the sesion object otherwise
-        // the session will be kept allocated until the timeout occurs.
-        // Destroying the session will release all allocated objects.
-        //
-        keepAlive.terminate();
-        keepAliveThread.Join();
-        session.destroy();
-
-        return status;
-    }
-
-    public static void Main(string[] args)
-    {
-        Client app = new Client();
-        int status = app.main(args, "config.client");
-        if(status != 0)
-        {
-            System.Environment.Exit(status);
-        }
-    }
-}
diff --git a/cs/demo/IceGrid/allocate/Hello.ice b/cs/demo/IceGrid/allocate/Hello.ice
deleted file mode 100644
index f6e0682d2a6..00000000000
--- a/cs/demo/IceGrid/allocate/Hello.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/cs/demo/IceGrid/allocate/HelloI.cs b/cs/demo/IceGrid/allocate/HelloI.cs
deleted file mode 100644
index 8d6a588c1a3..00000000000
--- a/cs/demo/IceGrid/allocate/HelloI.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using Demo;
-
-public class HelloI : HelloDisp_
-{
-    public HelloI(string name)
-    {
-        _name = name;
-    }
-
-    public override void sayHello(Ice.Current current)
-    {
-        Console.WriteLine(_name + " says Hello World!");
-    }
-
-    public override void shutdown(Ice.Current current)
-    {
-        Console.WriteLine(_name + " shutting down...");
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    private string _name;
-}
diff --git a/cs/demo/IceGrid/allocate/Makefile b/cs/demo/IceGrid/allocate/Makefile
deleted file mode 100644
index a88ab9d302d..00000000000
--- a/cs/demo/IceGrid/allocate/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../../..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.cs
-S_SRCS		= HelloI.cs Server.cs
-
-SLICE_SRCS	= $(SDIR)/Hello.ice
-
-SDIR		= .
-
-GDIR		= generated
-
-include $(top_srcdir)/config/Make.rules.cs
-
-MCSFLAGS	:= $(MCSFLAGS) -target:exe
-
-SLICE2CSFLAGS	:= $(SLICE2CSFLAGS) --ice -I. -I$(slicedir)
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(call ref,icegridcs) $(call ref,glacier2cs) $(subst /,$(DSEP),$^)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(subst /,$(DSEP),$^)
-
-clean::
-	-rm -rf db/node/* db/registry/*
-
-include .depend
diff --git a/cs/demo/IceGrid/allocate/Makefile.mak b/cs/demo/IceGrid/allocate/Makefile.mak
deleted file mode 100644
index 18938418ee1..00000000000
--- a/cs/demo/IceGrid/allocate/Makefile.mak
+++ /dev/null
@@ -1,40 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.cs
-S_SRCS		= HelloI.cs Server.cs
-
-GEN_SRCS	= $(GDIR)\Hello.cs
-
-SDIR		= .
-
-GDIR		= generated
-
-!include $(top_srcdir)\config\Make.rules.mak.cs
-
-MCSFLAGS	= $(MCSFLAGS) -target:exe
-
-SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --ice -I. -I$(slicedir)
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll -r:$(bindir)\icegridcs.dll -r:$(bindir)\glacier2cs.dll \
-		$(C_SRCS) $(GEN_SRCS)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll $(S_SRCS) $(GEN_SRCS)
-
-clean::
-	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
-
-!include .depend
diff --git a/cs/demo/IceGrid/allocate/README b/cs/demo/IceGrid/allocate/README
deleted file mode 100644
index fe9c0247fd9..00000000000
--- a/cs/demo/IceGrid/allocate/README
+++ /dev/null
@@ -1,56 +0,0 @@
-Note for Mono:
-
-    For this demo to work properly using Mono on Linux, you must
-    configure Linux to recognize Mono binaries. Configuration
-    instructions are provided in INSTALL.MONO at the top level of the
-    Ice for C# source distribution or, in README at the top level of
-    the Ice binary distribution (in /usr/share/doc/Ice-@ver@ if you
-    have installed Ice from RPMs).
-
-    Alternatively, if you do not want to reconfigure your kernel, or
-    if you want to run with Mono under Windows, edit
-    application-single.xml or application-multiple.xml
-    and change the server element to read:
-
-    <server id="AllocateServer" exe="mono" activation="on-demand">
-      <option>./server.exe</option>
-
-    Note that the server executable is "mono", and that the actual
-    server executable is passed as an argument to the Mono
-    interpreter.
-
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-This demo contains two application descriptor files. The first
-descriptor, application-single.xml, contains a single server and
-object. This object is allocated by the client using the
-allocateObjectById operation. Only one client can access this object
-at a time. All other clients will hang until the object is released.
-Use the following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-single.xml'"
-
-The second descriptor, application-multiple.xml, contains two servers,
-each with an object. The clients retrieve these objects using
-allocateObjectByType. Since there are two objects available, two
-clients can get access simultaneously. Additional clients will hang
-until one of the clients with an allocated object releases it. Use the
-following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-multiple.xml'"
-
-To run the client type:
-
-$ client.exe
-
-If you have already deployed the application, you can update it to try
-a different set of descriptors, for example:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application update 'application-multiple.xml'"
-
-Messages will be displayed in the IceGrid service window.
diff --git a/cs/demo/IceGrid/allocate/Server.cs b/cs/demo/IceGrid/allocate/Server.cs
deleted file mode 100644
index 12e42ed79a0..00000000000
--- a/cs/demo/IceGrid/allocate/Server.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public class Server : Ice.Application
-{
-    public override int run(string[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
-        Ice.Properties properties = communicator().getProperties();
-        Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    static public void Main(string[] args)
-    {
-        Server app = new Server();
-        int status = app.main(args);
-        if(status != 0)
-        {
-            System.Environment.Exit(status);
-        }
-    }
-}
diff --git a/cs/demo/IceGrid/allocate/allocateC.csproj b/cs/demo/IceGrid/allocate/allocateC.csproj
deleted file mode 100755
index fa068d472fc..00000000000
--- a/cs/demo/IceGrid/allocate/allocateC.csproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>client</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>

-    </RootNamespace>

-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>true</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>full</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>false</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>none</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="glacier2cs">

-      <Name>glacier2cs</Name>

-      <HintPath>..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="icegridcs">

-      <Name>icegridcs</Name>

-      <HintPath>..\..\..\bin\icegridcs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Client.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="generated\Hello.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>"$(SolutionDir)."\..\bin\generatecs.exe "$(SolutionDir)." "$(ProjectDir)." $(ProjectName)</PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/cs/demo/IceGrid/allocate/allocateS.csproj b/cs/demo/IceGrid/allocate/allocateS.csproj
deleted file mode 100755
index a5c91e22fd6..00000000000
--- a/cs/demo/IceGrid/allocate/allocateS.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>server</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>

-    </RootNamespace>

-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>true</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>full</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>false</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>none</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="glacier2cs">

-      <Name>glacier2</Name>

-      <HintPath>..\..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="generated\Hello.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="HelloI.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Server.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>"$(SolutionDir)."\..\bin\generatecs.exe "$(SolutionDir)." "$(ProjectDir)." $(ProjectName)</PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/cs/demo/IceGrid/allocate/application-multiple.xml b/cs/demo/IceGrid/allocate/application-multiple.xml
deleted file mode 100644
index a262abe6056..00000000000
--- a/cs/demo/IceGrid/allocate/application-multiple.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <server-template id="AllocateServer">
-      <parameter name="index"/>
-      <server id="AllocateServer-${index}" exe="./server.exe" activation="on-demand">
-        <adapter name="Hello" endpoints="tcp" register-process="true">
-	    <allocatable identity="hello-${index}" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </server-template>
-
-    <node name="localhost">
-      <server-instance template="AllocateServer" index="1"/>
-      <server-instance template="AllocateServer" index="2"/>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/cs/demo/IceGrid/allocate/application-single.xml b/cs/demo/IceGrid/allocate/application-single.xml
deleted file mode 100644
index ec0a14bf401..00000000000
--- a/cs/demo/IceGrid/allocate/application-single.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <node name="localhost">
-      <server id="AllocateServer" exe="./server.exe" activation="on-demand">
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/cs/demo/IceGrid/allocate/client.exe.config b/cs/demo/IceGrid/allocate/client.exe.config
deleted file mode 100755
index ad5c5baaca1..00000000000
--- a/cs/demo/IceGrid/allocate/client.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-  <configuration>
-    <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/glacier2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icecs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icepatch2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icestormcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/iceboxcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icegridcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icesslcs.dll"/>
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/cs/demo/IceGrid/allocate/config.client b/cs/demo/IceGrid/allocate/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/cs/demo/IceGrid/allocate/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/cs/demo/IceGrid/allocate/config.grid b/cs/demo/IceGrid/allocate/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/cs/demo/IceGrid/allocate/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/cs/demo/IceGrid/allocate/db/node/.gitignore b/cs/demo/IceGrid/allocate/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/allocate/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/allocate/db/registry/.gitignore b/cs/demo/IceGrid/allocate/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/allocate/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/allocate/generated/.gitignore b/cs/demo/IceGrid/allocate/generated/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/allocate/generated/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/allocate/server.exe.config b/cs/demo/IceGrid/allocate/server.exe.config
deleted file mode 100755
index ad5c5baaca1..00000000000
--- a/cs/demo/IceGrid/allocate/server.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-  <configuration>
-    <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/glacier2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icecs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icepatch2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icestormcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/iceboxcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icegridcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icesslcs.dll"/>
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/cs/demo/IceGrid/sessionActivation/.depend b/cs/demo/IceGrid/sessionActivation/.depend
deleted file mode 100644
index d36db71ec3d..00000000000
--- a/cs/demo/IceGrid/sessionActivation/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Hello.cs: ./Hello.ice
diff --git a/cs/demo/IceGrid/sessionActivation/.gitignore b/cs/demo/IceGrid/sessionActivation/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/cs/demo/IceGrid/sessionActivation/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/cs/demo/IceGrid/sessionActivation/Client.cs b/cs/demo/IceGrid/sessionActivation/Client.cs
deleted file mode 100644
index a7e7b35512e..00000000000
--- a/cs/demo/IceGrid/sessionActivation/Client.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using System.Threading;
-using Demo;
-
-
-public class Client : Ice.Application
-{
-    class SessionKeepAliveThread 
-    {
-        public SessionKeepAliveThread(IceGrid.SessionPrx session, int timeout)
-        {
-            _session = session;
-            _timeout = timeout;
-            _terminated = false;
-        }
-
-        public void run()
-        {
-            lock(this)
-            {
-                while(!_terminated)
-                {
-                    System.Threading.Monitor.Wait(this, _timeout);
-                    if(_terminated)
-                    {
-                        break;
-                    }
-                    try
-                    {
-                        _session.keepAlive();
-                    }
-                    catch(Ice.LocalException)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        public void terminate()
-        {
-            lock(this)
-            {
-                _terminated = true;
-                System.Threading.Monitor.Pulse(this);
-            }
-        }
-
-        private IceGrid.SessionPrx _session;
-        private int _timeout;
-        private bool _terminated;
-    }
-
-    private void menu()
-    {
-        Console.Out.WriteLine(
-            "usage:\n" +
-            "t: send greeting\n" +
-            "x: exit\n" +
-            "?: help\n");
-    }
-
-    public override int run(string[] args)
-    {
-        int status = 1;
-        IceGrid.RegistryPrx registry = 
-            IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
-        if(registry == null)
-        {
-            Console.WriteLine("could not contact registry");
-            return 1;
-        }
-
-        
-        IceGrid.SessionPrx session = null;
-        while(true)
-        {
-            Console.Out.WriteLine("This demo accepts any user-id / password combination.");
-
-            string id;
-            Console.Out.Write("user id: ");
-            Console.Out.Flush();
-            id = Console.In.ReadLine();
-
-            string pw;
-            Console.Out.Write("password: ");
-            Console.Out.Flush();
-            pw = Console.In.ReadLine();
-
-            try
-            {
-                session = registry.createSession(id, pw);
-                break;
-            }
-            catch(IceGrid.PermissionDeniedException ex)
-            {
-                Console.WriteLine("permission denied:\n" + ex.reason);
-            }
-        }
-
-        SessionKeepAliveThread keepAlive = new SessionKeepAliveThread(session, (int)registry.getSessionTimeout() / 2);
-        Thread keepAliveThread = new Thread(new ThreadStart(keepAlive.run));
-        keepAliveThread.Start();
-
-        try
-        {
-            HelloPrx hello = HelloPrxHelper.checkedCast(
-                session.allocateObjectById(communicator().stringToIdentity("hello")));
-
-            menu();
-            
-            string line = null;
-            do
-            {
-                try
-                {
-                    Console.Write("==> ");
-                    Console.Out.Flush();
-                    line = Console.In.ReadLine();
-                    if(line == null)
-                    {
-                        break;
-                    }
-                    if(line.Equals("t"))
-                    {
-                        hello.sayHello();
-                    }
-                    else if(line.Equals("x"))
-                    {
-                        // Nothing to do
-                    }
-                    else if(line.Equals("?"))
-                    {
-                        menu();
-                    }
-                    else
-                    {
-                        Console.WriteLine("unknown command `" + line + "'");
-                        menu();
-                    }
-                }
-                catch(Ice.LocalException ex)
-                {
-                    Console.WriteLine(ex);
-                }
-            }
-            while(!line.Equals("x"));
-        }
-        catch(IceGrid.AllocationException ex)
-        {
-            Console.WriteLine("could not allocate object: " + ex.reason);
-            status = 1;
-        }
-        catch(IceGrid.ObjectNotRegisteredException)
-        {
-            Console.WriteLine("object not registered with registry");
-            status = 1;
-        }
-        catch(Exception ex)
-        {
-            Console.WriteLine("expected exception: " + ex);
-            status = 1;
-        }
-
-        //
-        // Destroy the keepAlive thread and the sesion object otherwise
-        // the session will be kept allocated until the timeout occurs.
-        // Destroying the session will release all allocated objects.
-        //
-        keepAlive.terminate();
-        keepAliveThread.Join();
-        session.destroy();
-
-        return status;
-    }
-
-    public static void Main(string[] args)
-    {
-        Client app = new Client();
-        int status = app.main(args, "config.client");
-        if(status != 0)
-        {
-            System.Environment.Exit(status);
-        }
-    }
-}
diff --git a/cs/demo/IceGrid/sessionActivation/Hello.ice b/cs/demo/IceGrid/sessionActivation/Hello.ice
deleted file mode 100644
index 5bc96c90c7b..00000000000
--- a/cs/demo/IceGrid/sessionActivation/Hello.ice
+++ /dev/null
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-};
-
-};
-
-#endif
diff --git a/cs/demo/IceGrid/sessionActivation/HelloI.cs b/cs/demo/IceGrid/sessionActivation/HelloI.cs
deleted file mode 100644
index 58185209214..00000000000
--- a/cs/demo/IceGrid/sessionActivation/HelloI.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-using System;
-using Demo;
-
-public class HelloI : HelloDisp_
-{
-    public HelloI(string name)
-    {
-        _name = name;
-    }
-
-    public override void sayHello(Ice.Current current)
-    {
-        Console.WriteLine(_name + " says Hello World!");
-    }
-
-    private string _name;
-}
diff --git a/cs/demo/IceGrid/sessionActivation/Makefile b/cs/demo/IceGrid/sessionActivation/Makefile
deleted file mode 100644
index a88ab9d302d..00000000000
--- a/cs/demo/IceGrid/sessionActivation/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../../..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.cs
-S_SRCS		= HelloI.cs Server.cs
-
-SLICE_SRCS	= $(SDIR)/Hello.ice
-
-SDIR		= .
-
-GDIR		= generated
-
-include $(top_srcdir)/config/Make.rules.cs
-
-MCSFLAGS	:= $(MCSFLAGS) -target:exe
-
-SLICE2CSFLAGS	:= $(SLICE2CSFLAGS) --ice -I. -I$(slicedir)
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(call ref,icegridcs) $(call ref,glacier2cs) $(subst /,$(DSEP),$^)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ $(call ref,icecs) $(subst /,$(DSEP),$^)
-
-clean::
-	-rm -rf db/node/* db/registry/*
-
-include .depend
diff --git a/cs/demo/IceGrid/sessionActivation/Makefile.mak b/cs/demo/IceGrid/sessionActivation/Makefile.mak
deleted file mode 100644
index 18938418ee1..00000000000
--- a/cs/demo/IceGrid/sessionActivation/Makefile.mak
+++ /dev/null
@@ -1,40 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.cs
-S_SRCS		= HelloI.cs Server.cs
-
-GEN_SRCS	= $(GDIR)\Hello.cs
-
-SDIR		= .
-
-GDIR		= generated
-
-!include $(top_srcdir)\config\Make.rules.mak.cs
-
-MCSFLAGS	= $(MCSFLAGS) -target:exe
-
-SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --ice -I. -I$(slicedir)
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll -r:$(bindir)\icegridcs.dll -r:$(bindir)\glacier2cs.dll \
-		$(C_SRCS) $(GEN_SRCS)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(MCS) $(MCSFLAGS) -out:$@ -r:$(bindir)\icecs.dll $(S_SRCS) $(GEN_SRCS)
-
-clean::
-	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
-	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
-
-!include .depend
diff --git a/cs/demo/IceGrid/sessionActivation/README b/cs/demo/IceGrid/sessionActivation/README
deleted file mode 100644
index bf7c3af0ca9..00000000000
--- a/cs/demo/IceGrid/sessionActivation/README
+++ /dev/null
@@ -1,38 +0,0 @@
-Note for Mono:
-
-    For this demo to work properly using Mono on Linux, you must
-    configure Linux to recognize Mono binaries. Configuration
-    instructions are provided in INSTALL.MONO at the top level of the
-    Ice for C# source distribution or, in README at the top level of
-    the Ice binary distribution (in /usr/share/doc/Ice-@ver@ if you
-    have installed Ice from RPMs).
-
-    Alternatively, if you do not want to reconfigure your kernel, or
-    if you want to run with Mono under Windows, edit application.xml
-    and change the server element to read:
-
-    <server id="SessionServer" exe="mono" activation="session">
-      <option>./server.exe</option>
-
-    Note that the server executable is "mono", and that the actual
-    server executable is passed as an argument to the Mono
-    interpreter.
-
-This demo demonstrates the use of the session activation mode where
-the server is activated on demand once it is allocated by the client
-and deactivated when the client releases the server.
-
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-In a separate window:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application.xml'"
-$ client.exe
-
-This will deploy the application described in the file
-"application.xml" and start the client.
-
-Messages will be displayed in the IceGrid service window.
diff --git a/cs/demo/IceGrid/sessionActivation/Server.cs b/cs/demo/IceGrid/sessionActivation/Server.cs
deleted file mode 100644
index 12e42ed79a0..00000000000
--- a/cs/demo/IceGrid/sessionActivation/Server.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public class Server : Ice.Application
-{
-    public override int run(string[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
-        Ice.Properties properties = communicator().getProperties();
-        Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    static public void Main(string[] args)
-    {
-        Server app = new Server();
-        int status = app.main(args);
-        if(status != 0)
-        {
-            System.Environment.Exit(status);
-        }
-    }
-}
diff --git a/cs/demo/IceGrid/sessionActivation/application.xml b/cs/demo/IceGrid/sessionActivation/application.xml
deleted file mode 100644
index cfd097c58a0..00000000000
--- a/cs/demo/IceGrid/sessionActivation/application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Session">
-
-    <node name="localhost">
-      <server id="SessionServer" exe="./server.exe" activation="session">
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/cs/demo/IceGrid/sessionActivation/client.exe.config b/cs/demo/IceGrid/sessionActivation/client.exe.config
deleted file mode 100755
index ad5c5baaca1..00000000000
--- a/cs/demo/IceGrid/sessionActivation/client.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-  <configuration>
-    <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/glacier2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icecs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icepatch2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icestormcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/iceboxcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icegridcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icesslcs.dll"/>
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/cs/demo/IceGrid/sessionActivation/config.client b/cs/demo/IceGrid/sessionActivation/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/cs/demo/IceGrid/sessionActivation/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/cs/demo/IceGrid/sessionActivation/config.grid b/cs/demo/IceGrid/sessionActivation/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/cs/demo/IceGrid/sessionActivation/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/cs/demo/IceGrid/sessionActivation/db/node/.gitignore b/cs/demo/IceGrid/sessionActivation/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/sessionActivation/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/sessionActivation/db/registry/.gitignore b/cs/demo/IceGrid/sessionActivation/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/sessionActivation/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/sessionActivation/generated/.gitignore b/cs/demo/IceGrid/sessionActivation/generated/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/cs/demo/IceGrid/sessionActivation/generated/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/cs/demo/IceGrid/sessionActivation/server.exe.config b/cs/demo/IceGrid/sessionActivation/server.exe.config
deleted file mode 100755
index ad5c5baaca1..00000000000
--- a/cs/demo/IceGrid/sessionActivation/server.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-  <configuration>
-    <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly>
-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/glacier2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icecs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icepatch2cs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icestormcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/iceboxcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icegridcs.dll"/>
-        </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>
-          <codeBase version="3.2.0.0" href="../../../bin/icesslcs.dll"/>
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
diff --git a/cs/demo/IceGrid/sessionActivation/sessionActivationC.csproj b/cs/demo/IceGrid/sessionActivation/sessionActivationC.csproj
deleted file mode 100755
index 8c98525665d..00000000000
--- a/cs/demo/IceGrid/sessionActivation/sessionActivationC.csproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>client</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>

-    </RootNamespace>

-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>true</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>full</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>false</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>none</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="glacier2cs">

-      <Name>glacier2cs</Name>

-      <HintPath>..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="icegridcs">

-      <Name>icegridcs</Name>

-      <HintPath>..\..\..\bin\icegridcs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Client.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="generated\Hello.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>"$(SolutionDir)."\..\bin\generatecs.exe "$(SolutionDir)." "$(ProjectDir)." $(ProjectName)</PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/cs/demo/IceGrid/sessionActivation/sessionActivationS.csproj b/cs/demo/IceGrid/sessionActivation/sessionActivationS.csproj
deleted file mode 100755
index 08c82dcf86e..00000000000
--- a/cs/demo/IceGrid/sessionActivation/sessionActivationS.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>server</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>

-    </RootNamespace>

-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>true</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>full</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

-    <BaseAddress>285212672</BaseAddress>

-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

-    <DebugSymbols>false</DebugSymbols>

-    <FileAlignment>4096</FileAlignment>

-    <NoStdLib>false</NoStdLib>

-    <NoWarn>

-    </NoWarn>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>4</WarningLevel>

-    <DebugType>none</DebugType>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="glacier2cs">

-      <Name>glacier2cs</Name>

-      <HintPath>..\..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="generated\Hello.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="HelloI.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Server.cs">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>"$(SolutionDir)."\..\bin\generatecs.exe "$(SolutionDir)." "$(ProjectDir)." $(ProjectName)</PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/cs/demo/README b/cs/demo/README
index d7b680f86e2..1d456b217c3 100644
--- a/cs/demo/README
+++ b/cs/demo/README
@@ -5,3 +5,6 @@ on the various demos.
 
 The book directory contains demos for some of the code examples in
 "Distributed Programming with Ice".
+
+For more examples of the features of the Ice services (Glacier2, IceGrid,
+IceStorm) please see the demos in the Ice for C++ distibution.
diff --git a/cs/demo/demo.sln b/cs/demo/demo.sln
index 2fb56c66b7d..1a95bd100e6 100644
--- a/cs/demo/demo.sln
+++ b/cs/demo/demo.sln
@@ -60,14 +60,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "simpleIceGridC", "IceGrid\s
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "simpleIceGridS", "IceGrid\simple\simpleIceGridS.csproj", "{7F5F90B7-88D5-47EB-B8FD-2BEF5A08E0D9}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sessionActivationC", "IceGrid\sessionActivation\sessionActivationC.csproj", "{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sessionActivationS", "IceGrid\sessionActivation\sessionActivationS.csproj", "{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "allocateC", "IceGrid\allocate\allocateC.csproj", "{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "allocateS", "IceGrid\allocate\allocateS.csproj", "{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}"

-EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clockC", "IceStorm\clock\clockC.csproj", "{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clockS", "IceStorm\clock\clockS.csproj", "{FC6800FD-F1B4-4ADC-850C-6D53FFC26D81}"

@@ -204,22 +196,6 @@ Global
 		{7F5F90B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{7F5F90B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{7F5F90B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.Build.0 = Release|Any CPU

-		{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{2267CFB0-D945-4ED0-9E1D-6053A86BA43E}.Release|Any CPU.Build.0 = Release|Any CPU

-		{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{226790B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.Build.0 = Release|Any CPU

-		{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{1970CFB0-D945-4ED0-9E1D-6053A86BA43E}.Release|Any CPU.Build.0 = Release|Any CPU

-		{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{197090B7-88D5-47EB-B8FD-2BEF5A08E0D9}.Release|Any CPU.Build.0 = Release|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/java/demo/IceGrid/README b/java/demo/IceGrid/README
index da1160e9052..2586cd2df62 100644
--- a/java/demo/IceGrid/README
+++ b/java/demo/IceGrid/README
@@ -1,13 +1,5 @@
 Demos in this directory:
 
-- allocate
-
-  This demo shows how to use the allocation feature of IceGrid.
-
-- sessionActivation
-
-  This demo shows the use of the session activation mode.
-
 - simple
 
   This demo illustrates the basics of using IceGrid, including the 
diff --git a/java/demo/IceGrid/allocate/.gitignore b/java/demo/IceGrid/allocate/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/java/demo/IceGrid/allocate/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/java/demo/IceGrid/allocate/Client.java b/java/demo/IceGrid/allocate/Client.java
deleted file mode 100644
index 806f95b6f73..00000000000
--- a/java/demo/IceGrid/allocate/Client.java
+++ /dev/null
@@ -1,271 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class Client extends Ice.Application
-{
-    class ShutdownHook extends Thread
-    {
-        public void
-        run()
-        {
-            cleanup();
-            try
-            {
-                communicator().destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
-
-    static private class SessionKeepAliveThread extends Thread
-    {
-        SessionKeepAliveThread(IceGrid.SessionPrx session, long timeout)
-        {
-            _session = session;
-            _timeout = timeout;
-            _terminated = false;
-        }
-
-        synchronized public void
-        run()
-        {
-            while(!_terminated)
-            {
-                try
-                {
-                    wait(_timeout);
-                }
-                catch(InterruptedException e)
-                {
-                }
-                if(_terminated)
-                {
-                    break;
-                }
-                try
-                {
-                    _session.keepAlive();
-                }
-                catch(Ice.LocalException ex)
-                {
-                    break;
-                }
-            }
-        }
-
-        synchronized private void
-        terminate()
-        {
-            _terminated = true;
-            notify();
-        }
-
-        final private IceGrid.SessionPrx _session;
-        final private long _timeout;
-        private boolean _terminated;
-    }
-
-    private 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)
-    {
-        //
-        // Since this is an interactive demo we want to clear the
-        // Application installed interrupt callback and install our
-        // own shutdown hook.
-        //
-        setInterruptHook(new ShutdownHook());
-
-        int status = 0;
-        IceGrid.RegistryPrx registry = 
-            IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
-        if(registry == null)
-        {
-            System.err.println("could not contact registry");
-            return 1;
-        }
-
-        java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
-        while(true)
-        {
-            System.out.println("This demo accepts any user-id / password combination.");
-
-            try
-            {
-                String id;
-                System.out.print("user id: ");
-                System.out.flush();
-                id = in.readLine();
-                
-                String pw;
-                System.out.print("password: ");
-                System.out.flush();
-                pw = in.readLine();
-                
-                try
-                {
-                    synchronized(this)
-                    {
-                        _session = registry.createSession(id, pw);
-                    }
-                    break;
-                }
-                catch(IceGrid.PermissionDeniedException ex)
-                {
-                    System.out.println("permission denied:\n" + ex.reason);
-                }
-            }
-            catch(java.io.IOException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-
-        synchronized(this)
-        {
-            _keepAlive = new SessionKeepAliveThread(_session, registry.getSessionTimeout() / 2);
-            _keepAlive.start();
-        }
-
-        try
-        {
-            //
-            // First try to retrieve object by identity, which will
-            // work if the application-single.xml descriptor is
-            // used. Otherwise we retrieve object by type, which will
-            // succeed if the application-multiple.xml descriptor is
-            // used.
-            //
-            HelloPrx hello;
-            try
-            {
-                hello = HelloPrxHelper.checkedCast(
-                    _session.allocateObjectById(communicator().stringToIdentity("hello")));
-            }
-            catch(IceGrid.ObjectNotRegisteredException ex)
-            {
-                hello = HelloPrxHelper.checkedCast(_session.allocateObjectByType("::Demo::Hello"));
-            }
-
-            menu();
-            
-            String line = null;
-            do
-            {
-                try
-                {
-                    System.out.print("==> ");
-                    System.out.flush();
-                    line = in.readLine();
-                    if(line == null)
-                    {
-                        break;
-                    }
-                    if(line.equals("t"))
-                    {
-                        hello.sayHello();
-                    }
-                    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"));
-        }
-        catch(IceGrid.AllocationException ex)
-        {
-            System.err.println("could not allocate object: " + ex.reason);
-            status = 1;
-        }
-        catch(Exception ex)
-        {
-            System.err.println("expected exception: " + ex);
-            status = 1;
-        }
-
-        cleanup();
-
-        return status;
-    }
-
-    synchronized void
-    cleanup()
-    {
-        //
-        // Destroy the keepAlive thread and the sesion object otherwise
-        // the session will be kept allocated until the timeout occurs.
-        // Destroying the session will release all allocated objects.
-        //
-        if(_keepAlive != null)
-        {
-            _keepAlive.terminate();
-            try
-            {
-                _keepAlive.join();
-            }
-            catch(InterruptedException e)
-            {
-            }
-            _keepAlive = null;
-        }
-        if(_session != null)
-        {
-            _session.destroy();
-            _session = null;
-        }
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int status = app.main("Client", args, "config.client");
-        System.exit(status);
-    }
-
-    SessionKeepAliveThread _keepAlive;
-    IceGrid.SessionPrx _session;
-}
diff --git a/java/demo/IceGrid/allocate/Hello.ice b/java/demo/IceGrid/allocate/Hello.ice
deleted file mode 100644
index f6e0682d2a6..00000000000
--- a/java/demo/IceGrid/allocate/Hello.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/java/demo/IceGrid/allocate/HelloI.java b/java/demo/IceGrid/allocate/HelloI.java
deleted file mode 100644
index 39bfae4682d..00000000000
--- a/java/demo/IceGrid/allocate/HelloI.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class HelloI extends _HelloDisp
-{
-    public HelloI(String name)
-    {
-        _name = name;
-    }
-
-    public void
-    sayHello(Ice.Current current)
-    {
-        System.out.println(_name + " says Hello World!");
-    }
-
-    public void
-    shutdown(Ice.Current current)
-    {
-        System.out.println(_name + " shutting down...");
-        current.adapter.getCommunicator().shutdown();
-    }
-
-    private final String _name;
-}
diff --git a/java/demo/IceGrid/allocate/README b/java/demo/IceGrid/allocate/README
deleted file mode 100644
index 06178e8ae5f..00000000000
--- a/java/demo/IceGrid/allocate/README
+++ /dev/null
@@ -1,35 +0,0 @@
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-This demo contains two application descriptor files. The first
-descriptor, application-single.xml, contains a single server and
-object. This object is allocated by the client using the
-allocateObjectById operation. Only one client can access this object
-at a time. All other clients will hang until the object is released.
-Use the following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-single.xml'"
-
-The second descriptor, application-multiple.xml, contains two servers,
-each with an object. The clients retrieve these objects using
-allocateObjectByType. Since there are two objects available, two
-clients can get access simultaneously. Additional clients will hang
-until one of the clients with an allocated object releases it. Use the
-following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-multiple.xml'"
-
-To run the client type:
-
-$ java Client
-
-If you have already deployed the application, you can update it to try
-a different set of descriptors, for example:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application update 'application-multiple.xml'"
-
-Messages will be displayed in the IceGrid service window.
diff --git a/java/demo/IceGrid/allocate/Server.java b/java/demo/IceGrid/allocate/Server.java
deleted file mode 100644
index 1c7722e7a71..00000000000
--- a/java/demo/IceGrid/allocate/Server.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public class Server extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
-        Ice.Properties properties = communicator().getProperties();
-        Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    static public void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int status = app.main("Server", args);
-        System.exit(status);
-    }
-}
diff --git a/java/demo/IceGrid/allocate/application-multiple.xml b/java/demo/IceGrid/allocate/application-multiple.xml
deleted file mode 100644
index 1ccd203b3b2..00000000000
--- a/java/demo/IceGrid/allocate/application-multiple.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <server-template id="AllocateServer">
-      <parameter name="index"/>
-      <server id="AllocateServer-${index}" exe="java" activation="on-demand">
-        <option>Server</option>
-        <adapter name="Hello" endpoints="tcp" register-process="true">
-          <allocatable identity="hello-${index}" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </server-template>
-
-    <node name="localhost">
-      <server-instance template="AllocateServer" index="1"/>
-      <server-instance template="AllocateServer" index="2"/>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/java/demo/IceGrid/allocate/application-single.xml b/java/demo/IceGrid/allocate/application-single.xml
deleted file mode 100644
index f830d38132d..00000000000
--- a/java/demo/IceGrid/allocate/application-single.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <node name="localhost">
-      <server id="AllocateServer" exe="java" activation="on-demand">
-        <option>Server</option>
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/java/demo/IceGrid/allocate/build.xml b/java/demo/IceGrid/allocate/build.xml
deleted file mode 100644
index 6619ade4480..00000000000
--- a/java/demo/IceGrid/allocate/build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<project name="demo_IceGrid_allocate" 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="generate" depends="init">
-        <!-- Create the output directory for generated code -->
-        <mkdir dir="${generated.dir}"/>
-        <slice2java outputdir="${generated.dir}">
-	    <meta value="${java2metadata}"/>
-            <fileset dir="." includes="Hello.ice"/>
-        </slice2java>
-    </target>
-
-    <target name="compile" depends="generate">
-        <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
-        </javac>
-    </target>
-
-    <target name="all" depends="compile"/>
-
-    <target name="clean">
-        <delete dir="${generated.dir}"/>
-        <delete dir="${class.dir}"/>
-        <delete quiet="true" includeEmptyDirs="true">
-	    <fileset dir="db/node" excludes=".gitignore"/>
-            <fileset dir="db/registry" excludes=".gitignore"/>
-        </delete>
-    </target>
-
-</project>
diff --git a/java/demo/IceGrid/allocate/config.client b/java/demo/IceGrid/allocate/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/java/demo/IceGrid/allocate/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/java/demo/IceGrid/allocate/config.grid b/java/demo/IceGrid/allocate/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/java/demo/IceGrid/allocate/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/java/demo/IceGrid/allocate/db/node/.gitignore b/java/demo/IceGrid/allocate/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/demo/IceGrid/allocate/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/demo/IceGrid/allocate/db/registry/.gitignore b/java/demo/IceGrid/allocate/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/demo/IceGrid/allocate/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/demo/IceGrid/build.xml b/java/demo/IceGrid/build.xml
index e23f90bbb80..e6e86ab4fda 100644
--- a/java/demo/IceGrid/build.xml
+++ b/java/demo/IceGrid/build.xml
@@ -13,14 +13,10 @@
 
     <target name="all">
         <ant dir="simple"/>
-        <ant dir="sessionActivation"/>
-        <ant dir="allocate"/>
     </target>
 
     <target name="clean">
         <ant dir="simple" target="clean"/>
-        <ant dir="sessionActivation" target="clean"/>
-        <ant dir="allocate" target="clean"/>
     </target>
 
 </project>
diff --git a/java/demo/IceGrid/sessionActivation/.gitignore b/java/demo/IceGrid/sessionActivation/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/java/demo/IceGrid/sessionActivation/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/java/demo/IceGrid/sessionActivation/Client.java b/java/demo/IceGrid/sessionActivation/Client.java
deleted file mode 100644
index f16c19c13a0..00000000000
--- a/java/demo/IceGrid/sessionActivation/Client.java
+++ /dev/null
@@ -1,256 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class Client extends Ice.Application
-{
-    class ShutdownHook extends Thread
-    {
-        public void
-        run()
-        {
-            cleanup();
-            try
-            {
-                communicator().destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
-
-    static private class SessionKeepAliveThread extends Thread
-    {
-        SessionKeepAliveThread(IceGrid.SessionPrx session, long timeout)
-        {
-            _session = session;
-            _timeout = timeout;
-            _terminated = false;
-        }
-
-        synchronized public void
-        run()
-        {
-            while(!_terminated)
-            {
-                try
-                {
-                    wait(_timeout);
-                }
-                catch(InterruptedException e)
-                {
-                }
-                if(_terminated)
-                {
-                    break;
-                }
-                try
-                {
-                    _session.keepAlive();
-                }
-                catch(Ice.LocalException ex)
-                {
-                    break;
-                }
-            }
-        }
-
-        synchronized private void
-        terminate()
-        {
-            _terminated = true;
-            notify();
-        }
-
-        final private IceGrid.SessionPrx _session;
-        final private long _timeout;
-        private boolean _terminated;
-    }
-
-    private void
-    menu()
-    {
-        System.out.println(
-            "usage:\n" +
-            "t: send greeting\n" +
-            "x: exit\n" +
-            "?: help\n");
-    }
-
-    public int
-    run(String[] args)
-    {
-        //
-        // Since this is an interactive demo we want to clear the
-        // Application installed interrupt callback and install our
-        // own shutdown hook.
-        //
-        setInterruptHook(new ShutdownHook());
-
-        int status = 0;
-        IceGrid.RegistryPrx registry = 
-            IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"));
-        if(registry == null)
-        {
-            System.err.println("could not contact registry");
-            return 1;
-        }
-
-        java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
-        while(true)
-        {
-            System.out.println("This demo accepts any user-id / password combination.");
-
-            try
-            {
-                String id;
-                System.out.print("user id: ");
-                System.out.flush();
-                id = in.readLine();
-                
-                String pw;
-                System.out.print("password: ");
-                System.out.flush();
-                pw = in.readLine();
-                
-                try
-                {
-                    synchronized(this)
-                    {
-                        _session = registry.createSession(id, pw);
-                    }
-                    break;
-                }
-                catch(IceGrid.PermissionDeniedException ex)
-                {
-                    System.out.println("permission denied:\n" + ex.reason);
-                }
-            }
-            catch(java.io.IOException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-
-        synchronized(this)
-        {
-            _keepAlive = new SessionKeepAliveThread(_session, registry.getSessionTimeout() / 2);
-            _keepAlive.start();
-        }
-
-        try
-        {
-            HelloPrx hello = HelloPrxHelper.checkedCast(
-                _session.allocateObjectById(communicator().stringToIdentity("hello")));
-
-            menu();
-            
-            String line = null;
-            do
-            {
-                try
-                {
-                    System.out.print("==> ");
-                    System.out.flush();
-                    line = in.readLine();
-                    if(line == null)
-                    {
-                        break;
-                    }
-                    if(line.equals("t"))
-                    {
-                        hello.sayHello();
-                    }
-                    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"));
-        }
-        catch(IceGrid.AllocationException ex)
-        {
-            System.err.println("could not allocate object: " + ex.reason);
-            status = 1;
-        }
-        catch(IceGrid.ObjectNotRegisteredException ex)
-        {
-            System.err.println("object not registered with registry");
-            status = 1;
-        }
-        catch(Exception ex)
-        {
-            System.err.println("expected exception: " + ex);
-            status = 1;
-        }
-
-        cleanup();
-
-        return status;
-    }
-
-    synchronized void
-    cleanup()
-    {
-        //
-        // Destroy the keepAlive thread and the sesion object otherwise
-        // the session will be kept allocated until the timeout occurs.
-        // Destroying the session will release all allocated objects.
-        //
-        if(_keepAlive != null)
-        {
-            _keepAlive.terminate();
-            try
-            {
-                _keepAlive.join();
-            }
-            catch(InterruptedException e)
-            {
-            }
-            _keepAlive = null;
-        }
-        if(_session != null)
-        {
-            _session.destroy();
-            _session = null;
-        }
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Client app = new Client();
-        int status = app.main("Client", args, "config.client");
-        System.exit(status);
-    }
-
-    SessionKeepAliveThread _keepAlive;
-    IceGrid.SessionPrx _session;
-}
diff --git a/java/demo/IceGrid/sessionActivation/Hello.ice b/java/demo/IceGrid/sessionActivation/Hello.ice
deleted file mode 100644
index 5bc96c90c7b..00000000000
--- a/java/demo/IceGrid/sessionActivation/Hello.ice
+++ /dev/null
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-};
-
-};
-
-#endif
diff --git a/java/demo/IceGrid/sessionActivation/HelloI.java b/java/demo/IceGrid/sessionActivation/HelloI.java
deleted file mode 100644
index 9d24965de41..00000000000
--- a/java/demo/IceGrid/sessionActivation/HelloI.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-import Demo.*;
-
-public class HelloI extends _HelloDisp
-{
-    public HelloI(String name)
-    {
-        _name = name;
-    }
-
-    public void
-    sayHello(Ice.Current current)
-    {
-        System.out.println(_name + " says Hello World!");
-    }
-
-    private final String _name;
-}
diff --git a/java/demo/IceGrid/sessionActivation/README b/java/demo/IceGrid/sessionActivation/README
deleted file mode 100644
index b66bd5e8f08..00000000000
--- a/java/demo/IceGrid/sessionActivation/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This demo demonstrates the use of the session activation mode where
-the server is activated on demand once it is allocated by the client
-and deactivated when the client releases the server.
-
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-In a separate window:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application.xml'"
-$ java Client
-
-This will deploy the application described in the file
-"application.xml" and start the client.
-
-Messages will be displayed in the IceGrid service window.
diff --git a/java/demo/IceGrid/sessionActivation/Server.java b/java/demo/IceGrid/sessionActivation/Server.java
deleted file mode 100644
index 1c7722e7a71..00000000000
--- a/java/demo/IceGrid/sessionActivation/Server.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-public class Server extends Ice.Application
-{
-    public int
-    run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Hello");
-        Ice.Properties properties = communicator().getProperties();
-        Ice.Identity id = communicator().stringToIdentity(properties.getProperty("Identity"));
-        adapter.add(new HelloI(properties.getProperty("Ice.ServerId")), id);
-        adapter.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
-
-    static public void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int status = app.main("Server", args);
-        System.exit(status);
-    }
-}
diff --git a/java/demo/IceGrid/sessionActivation/application.xml b/java/demo/IceGrid/sessionActivation/application.xml
deleted file mode 100644
index f768c84413a..00000000000
--- a/java/demo/IceGrid/sessionActivation/application.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Session">
-
-    <node name="localhost">
-      <server id="SessionServer" exe="java" activation="session">
-        <option>Server</option>
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/java/demo/IceGrid/sessionActivation/build.xml b/java/demo/IceGrid/sessionActivation/build.xml
deleted file mode 100644
index a607346b336..00000000000
--- a/java/demo/IceGrid/sessionActivation/build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<project name="demo_IceGrid_sessionActivation" 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="generate" depends="init">
-        <!-- Create the output directory for generated code -->
-        <mkdir dir="${generated.dir}"/>
-        <slice2java outputdir="${generated.dir}">
-	    <meta value="${java2metadata}"/>
-            <fileset dir="." includes="Hello.ice"/>
-        </slice2java>
-    </target>
-
-    <target name="compile" depends="generate">
-        <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
-        </javac>
-    </target>
-
-    <target name="all" depends="compile"/>
-
-    <target name="clean">
-        <delete dir="${generated.dir}"/>
-        <delete dir="${class.dir}"/>
-        <delete quiet="true" includeEmptyDirs="true">
-	    <fileset dir="db/node" excludes=".gitignore"/>
-            <fileset dir="db/registry" excludes=".gitignore"/>
-        </delete>
-    </target>
-
-</project>
diff --git a/java/demo/IceGrid/sessionActivation/config.client b/java/demo/IceGrid/sessionActivation/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/java/demo/IceGrid/sessionActivation/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/java/demo/IceGrid/sessionActivation/config.grid b/java/demo/IceGrid/sessionActivation/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/java/demo/IceGrid/sessionActivation/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/java/demo/IceGrid/sessionActivation/db/node/.gitignore b/java/demo/IceGrid/sessionActivation/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/demo/IceGrid/sessionActivation/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/demo/IceGrid/sessionActivation/db/registry/.gitignore b/java/demo/IceGrid/sessionActivation/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/java/demo/IceGrid/sessionActivation/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/java/demo/README b/java/demo/README
index c30fbcec28e..d82f6443815 100644
--- a/java/demo/README
+++ b/java/demo/README
@@ -5,3 +5,6 @@ on the demos.
 
 The book directory contains demos for some of the code examples in
 "Distributed Programming with Ice".
+
+For more examples of the features of the Ice services (Glacier2, IceGrid,
+IceStorm) please see the demos in the Ice for C++ distibution.
diff --git a/py/demo/IceGrid/README b/py/demo/IceGrid/README
index da1160e9052..2586cd2df62 100644
--- a/py/demo/IceGrid/README
+++ b/py/demo/IceGrid/README
@@ -1,13 +1,5 @@
 Demos in this directory:
 
-- allocate
-
-  This demo shows how to use the allocation feature of IceGrid.
-
-- sessionActivation
-
-  This demo shows the use of the session activation mode.
-
 - simple
 
   This demo illustrates the basics of using IceGrid, including the 
diff --git a/py/demo/IceGrid/allocate/.gitignore b/py/demo/IceGrid/allocate/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/py/demo/IceGrid/allocate/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/py/demo/IceGrid/allocate/Client.py b/py/demo/IceGrid/allocate/Client.py
deleted file mode 100644
index e1d07675e2b..00000000000
--- a/py/demo/IceGrid/allocate/Client.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import sys, threading, Ice, IceGrid
-
-Ice.loadSlice('Hello.ice')
-import Demo
-
-def menu():
-    print """
-usage:
-t: send greeting
-s: shutdown server
-x: exit
-?: help
-"""
-
-class SessionKeepAliveThread(threading.Thread):
-    def __init__(self, session, timeout):
-        threading.Thread.__init__(self)
-        self._session = session
-        self._timeout = timeout
-        self._terminated = False
-        self._cond = threading.Condition()
-
-    def run(self):
-        self._cond.acquire()
-        try:
-            while not self._terminated:
-                self._cond.wait(self._timeout)
-                if self._terminated:
-                    break
-                try:
-                    self._session.keepAlive()
-                except Ice.LocalException, ex:
-                    break
-        finally:
-            self._cond.release()
-
-    def terminate(self):
-        self._cond.acquire()
-        try:
-            self._terminated = True
-            self._cond.notify()
-        finally:
-            self._cond.release()
-
-class Client(Ice.Application):
-    def run(self, args):
-        status = 0
-        registry = IceGrid.RegistryPrx.checkedCast(self.communicator().stringToProxy("DemoIceGrid/Registry"))
-        if registry == None:
-            print self.appName() + ": could not contact registry"
-            return 1
-
-        while True:
-            print "This demo accepts any user-id / password combination."
-            id = raw_input("user id: ").strip()
-            pw = raw_input("password: ").strip()
-            try:
-                session = registry.createSession(id, pw)
-                break
-            except IceGrid.PermissionDeniedException, ex:
-                print "permission denied:\n" + ex.reason
-
-        keepAlive = SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
-        keepAlive.start()
-
-        try:
-            try:
-                hello = Demo.HelloPrx.checkedCast(\
-                    session.allocateObjectById(self.communicator().stringToIdentity("hello")))
-            except IceGrid.ObjectNotRegisteredException:
-                hello = Demo.HelloPrx.checkedCast(session.allocateObjectByType("::Demo::Hello"))
-
-            menu()
-
-            c = None
-            while c != 'x':
-                try:
-                    c = raw_input("==> ")
-                    if c == 't':
-                        hello.sayHello()
-                    elif c == 's':
-                        hello.shutdown()
-                    elif c == 'x':
-                        pass # Nothing to do
-                    elif c == '?':
-                        menu()
-                    else:
-                        print "unknown command `" + c + "'"
-                        menu()
-                except EOFError:
-                    break
-                except KeyboardInterrupt:
-                    break
-        except IceGrid.AllocationException, ex:
-            print self.appName() + ": could not allocate object: " + ex.reason
-            status = 1
-        except:
-            print self.appName() + ": could not allocate object: " + str(sys.exc_info()[0])
-            status = 1
-
-        #
-        # Destroy the keepAlive thread and the sesion object otherwise
-        # the session will be kept allocated until the timeout occurs.
-        # Destroying the session will release all allocated objects.
-        #
-        keepAlive.terminate()
-        keepAlive.join()
-        session.destroy();
-
-        return status
-
-app = Client()
-sys.exit(app.main(sys.argv, "config.client"))
diff --git a/py/demo/IceGrid/allocate/Hello.ice b/py/demo/IceGrid/allocate/Hello.ice
deleted file mode 100644
index f6e0682d2a6..00000000000
--- a/py/demo/IceGrid/allocate/Hello.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/py/demo/IceGrid/allocate/README b/py/demo/IceGrid/allocate/README
deleted file mode 100644
index 7ef7eaf65d2..00000000000
--- a/py/demo/IceGrid/allocate/README
+++ /dev/null
@@ -1,35 +0,0 @@
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-This demo contains two application descriptor files. The first
-descriptor, application-single.xml, contains a single server and
-object. This object is allocated by the client using the
-allocateObjectById operation. Only one client can access this object
-at a time. All other clients will hang until the object is released.
-Use the following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-single.xml'"
-
-The second descriptor, application-multiple.xml, contains two servers,
-each with an object. The clients retrieve these objects using
-allocateObjectByType. Since there are two objects available, two
-clients can get access simultaneously. Additional clients will hang
-until one of the clients with an allocated object releases it. Use the
-following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-multiple.xml'"
-
-To run the client type:
-
-$ python Client.py
-
-If you have already deployed the application, you can update it to try
-a different set of descriptors, for example:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application update 'application-multiple.xml'"
-
-Messages will be displayed in the IceGrid service window.
diff --git a/py/demo/IceGrid/allocate/Server.py b/py/demo/IceGrid/allocate/Server.py
deleted file mode 100644
index bf2dc212601..00000000000
--- a/py/demo/IceGrid/allocate/Server.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import sys, traceback, Ice
-
-Ice.loadSlice('Hello.ice')
-import Demo
-
-class HelloI(Demo.Hello):
-    def __init__(self, name):
-        self.name = name
-
-    def sayHello(self, current=None):
-        print self.name + " says Hello World!"
-
-    def shutdown(self, current=None):
-        print self.name + " shutting down..."
-        current.adapter.getCommunicator().shutdown()
-
-class Server(Ice.Application):
-    def run(self, args):
-        properties = self.communicator().getProperties()
-        adapter = self.communicator().createObjectAdapter("Hello")
-        id = self.communicator().stringToIdentity(properties.getProperty("Identity"))
-        adapter.add(HelloI(properties.getProperty("Ice.ServerId")), id)
-        adapter.activate()
-        self.communicator().waitForShutdown()
-        return 0
-
-app = Server()
-sys.exit(app.main(sys.argv))
diff --git a/py/demo/IceGrid/allocate/application-multiple.xml b/py/demo/IceGrid/allocate/application-multiple.xml
deleted file mode 100644
index f25de3d0977..00000000000
--- a/py/demo/IceGrid/allocate/application-multiple.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <server-template id="AllocateServer">
-      <parameter name="index"/>
-      <server id="AllocateServer-${index}" exe="python" activation="on-demand">
-        <option>Server.py</option>
-        <adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello-${index}" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </server-template>
-
-    <node name="localhost">
-      <server-instance template="AllocateServer" index="1"/>
-      <server-instance template="AllocateServer" index="2"/>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/py/demo/IceGrid/allocate/application-single.xml b/py/demo/IceGrid/allocate/application-single.xml
deleted file mode 100644
index 2eaa98797ff..00000000000
--- a/py/demo/IceGrid/allocate/application-single.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <node name="localhost">
-      <server id="AllocateServer" exe="python" activation="on-demand">
-        <option>Server.py</option>
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/py/demo/IceGrid/allocate/config.client b/py/demo/IceGrid/allocate/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/py/demo/IceGrid/allocate/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/py/demo/IceGrid/allocate/config.grid b/py/demo/IceGrid/allocate/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/py/demo/IceGrid/allocate/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/py/demo/IceGrid/allocate/db/node/.gitignore b/py/demo/IceGrid/allocate/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/py/demo/IceGrid/allocate/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/py/demo/IceGrid/allocate/db/registry/.gitignore b/py/demo/IceGrid/allocate/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/py/demo/IceGrid/allocate/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/py/demo/IceGrid/sessionActivation/.gitignore b/py/demo/IceGrid/sessionActivation/.gitignore
deleted file mode 100644
index 3e9f78f05d8..00000000000
--- a/py/demo/IceGrid/sessionActivation/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-db/registry/*
-db/node/*
diff --git a/py/demo/IceGrid/sessionActivation/Client.py b/py/demo/IceGrid/sessionActivation/Client.py
deleted file mode 100644
index 0bf139e0a37..00000000000
--- a/py/demo/IceGrid/sessionActivation/Client.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import sys, threading, Ice, IceGrid
-
-Ice.loadSlice('Hello.ice')
-import Demo
-
-def menu():
-    print """
-usage:
-t: send greeting as twoway
-x: exit
-?: help
-"""
-
-class SessionKeepAliveThread(threading.Thread):
-    def __init__(self, session, timeout):
-        threading.Thread.__init__(self)
-        self._session = session
-        self._timeout = timeout
-        self._terminated = False
-        self._cond = threading.Condition()
-
-    def run(self):
-        self._cond.acquire()
-        try:
-            while not self._terminated:
-                self._cond.wait(self._timeout)
-                if self._terminated:
-                    break
-                try:
-                    self._session.keepAlive()
-                except Ice.LocalException, ex:
-                    break
-        finally:
-            self._cond.release()
-
-    def terminate(self):
-        self._cond.acquire()
-        try:
-            self._terminated = True
-            self._cond.notify()
-        finally:
-            self._cond.release()
-
-class Client(Ice.Application):
-    def run(self, args):
-        status = 0
-        registry = IceGrid.RegistryPrx.checkedCast(self.communicator().stringToProxy("DemoIceGrid/Registry"))
-        if registry == None:
-            print self.appName() + ": could not contact registry"
-            return 1
-
-        while True:
-            print "This demo accepts any user-id / password combination."
-            id = raw_input("user id: ").strip()
-            pw = raw_input("password: ").strip()
-            try:
-                session = registry.createSession(id, pw)
-                break
-            except IceGrid.PermissionDeniedException, ex:
-                print "permission denied:\n" + ex.reason
-
-        keepAlive = SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
-        keepAlive.start()
-
-        try:
-            hello = Demo.HelloPrx.checkedCast(session.allocateObjectById(self.communicator().stringToIdentity("hello")))
-
-            menu()
-
-            c = None
-            while c != 'x':
-                try:
-                    c = raw_input("==> ")
-                    if c == 't':
-                        hello.sayHello()
-                    elif c == 'x':
-                        pass # Nothing to do
-                    elif c == '?':
-                        menu()
-                    else:
-                        print "unknown command `" + c + "'"
-                        menu()
-                except EOFError:
-                    break
-                except KeyboardInterrupt:
-                    break
-        except IceGrid.AllocationException, ex:
-            print self.appName() + ": could not allocate object: " + ex.reason
-            status = 1
-        except IceGrid.ObjectNotRegisteredException:
-            print self.appName() + ": object not registered with registry"
-            status = 1
-        except:
-            print self.appName() + ": could not allocate object: " + str(sys.exc_info()[0])
-            status = 1
-
-        #
-        # Destroy the keepAlive thread and the sesion object otherwise
-        # the session will be kept allocated until the timeout occurs.
-        # Destroying the session will release all allocated objects.
-        #
-        keepAlive.terminate()
-        keepAlive.join()
-        session.destroy();
-
-        return status
-
-app = Client()
-sys.exit(app.main(sys.argv, "config.client"))
diff --git a/py/demo/IceGrid/sessionActivation/Hello.ice b/py/demo/IceGrid/sessionActivation/Hello.ice
deleted file mode 100644
index 5bc96c90c7b..00000000000
--- a/py/demo/IceGrid/sessionActivation/Hello.ice
+++ /dev/null
@@ -1,23 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-};
-
-};
-
-#endif
diff --git a/py/demo/IceGrid/sessionActivation/README b/py/demo/IceGrid/sessionActivation/README
deleted file mode 100644
index 0a665744a28..00000000000
--- a/py/demo/IceGrid/sessionActivation/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This demo demonstrates the use of the session activation mode where
-the server is activated on demand once it is allocated by the client
-and deactivated when the client releases the server.
-
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-In a separate window:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application.xml'"
-$ python Client.py
-
-This will deploy the application described in the file
-"application.xml" and start the client.
-
-Messages will be displayed in the IceGrid service window.
diff --git a/py/demo/IceGrid/sessionActivation/Server.py b/py/demo/IceGrid/sessionActivation/Server.py
deleted file mode 100644
index d4e4008a98d..00000000000
--- a/py/demo/IceGrid/sessionActivation/Server.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import sys, traceback, Ice
-
-Ice.loadSlice('Hello.ice')
-import Demo
-
-class HelloI(Demo.Hello):
-    def __init__(self, name):
-        self.name = name
-
-    def sayHello(self, current=None):
-        print self.name + " says Hello World!"
-
-class Server(Ice.Application):
-    def run(self, args):
-        properties = self.communicator().getProperties()
-        adapter = self.communicator().createObjectAdapter("Hello")
-        id = self.communicator().stringToIdentity(properties.getProperty("Identity"))
-        adapter.add(HelloI(properties.getProperty("Ice.ServerId")), id)
-        adapter.activate()
-        self.communicator().waitForShutdown()
-        return 0
-
-app = Server()
-sys.exit(app.main(sys.argv))
diff --git a/py/demo/IceGrid/sessionActivation/application.xml b/py/demo/IceGrid/sessionActivation/application.xml
deleted file mode 100644
index 79ad063003f..00000000000
--- a/py/demo/IceGrid/sessionActivation/application.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Session">
-
-    <node name="localhost">
-      <server id="SessionServer" exe="python" activation="session">
-        <option>Server.py</option>
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" property="Identity"/>
-	</adapter>
-	<property name="Identity" value="hello"/>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/py/demo/IceGrid/sessionActivation/config.client b/py/demo/IceGrid/sessionActivation/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/py/demo/IceGrid/sessionActivation/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/py/demo/IceGrid/sessionActivation/config.grid b/py/demo/IceGrid/sessionActivation/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/py/demo/IceGrid/sessionActivation/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/py/demo/IceGrid/sessionActivation/db/node/.gitignore b/py/demo/IceGrid/sessionActivation/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/py/demo/IceGrid/sessionActivation/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/py/demo/IceGrid/sessionActivation/db/registry/.gitignore b/py/demo/IceGrid/sessionActivation/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/py/demo/IceGrid/sessionActivation/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/py/demo/README b/py/demo/README
index 21ea6906a27..02f8fa38099 100644
--- a/py/demo/README
+++ b/py/demo/README
@@ -2,3 +2,6 @@ This directory contains demos for various Ice components. The demos
 are provided to get you started on how to use a particular feature or
 coding technique. See the README file in each subdirectory for details
 on the demos.
+
+For more examples of the features of the Ice services (Glacier2, IceGrid,
+IceStorm) please see the demos in the Ice for C++ distibution.
diff --git a/rb/demo/README b/rb/demo/README
index 21ea6906a27..0598b4fc9f8 100644
--- a/rb/demo/README
+++ b/rb/demo/README
@@ -2,3 +2,6 @@ This directory contains demos for various Ice components. The demos
 are provided to get you started on how to use a particular feature or
 coding technique. See the README file in each subdirectory for details
 on the demos.
+
+For examples of the features of the Ice services (Glacier2, IceGrid,
+IceStorm) please see the demos in the Ice for C++ distibution.
diff --git a/vb/demo/IceGrid/Makefile.mak b/vb/demo/IceGrid/Makefile.mak
index 6d2e737ee64..6c8ce89a5cb 100755
--- a/vb/demo/IceGrid/Makefile.mak
+++ b/vb/demo/IceGrid/Makefile.mak
@@ -11,9 +11,7 @@ top_srcdir	= ..\..
 
 !include $(top_srcdir)\config\Make.rules.mak.vb
 
-SUBDIRS		= simple \
-		  sessionActivation \
-		  allocate
+SUBDIRS		= simple
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/vb/demo/IceGrid/README b/vb/demo/IceGrid/README
index da1160e9052..2586cd2df62 100644
--- a/vb/demo/IceGrid/README
+++ b/vb/demo/IceGrid/README
@@ -1,13 +1,5 @@
 Demos in this directory:
 
-- allocate
-
-  This demo shows how to use the allocation feature of IceGrid.
-
-- sessionActivation
-
-  This demo shows the use of the session activation mode.
-
 - simple
 
   This demo illustrates the basics of using IceGrid, including the 
diff --git a/vb/demo/IceGrid/allocate/.depend b/vb/demo/IceGrid/allocate/.depend
deleted file mode 100644
index 75ff6587933..00000000000
--- a/vb/demo/IceGrid/allocate/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Hello.vb: ./Hello.ice

diff --git a/vb/demo/IceGrid/allocate/Client.vb b/vb/demo/IceGrid/allocate/Client.vb
deleted file mode 100755
index 272a30b41c9..00000000000
--- a/vb/demo/IceGrid/allocate/Client.vb
+++ /dev/null
@@ -1,156 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Imports Allocate.Demo
-Imports System
-Imports System.Threading
-
-Module AllocateC
-
-    Class Client
-        Inherits Ice.Application
-
-        Class SessionKeepAliveThread
-
-            Public Sub New(ByVal session As IceGrid.SessionPrx, ByVal timeout As Long)
-                _session = session
-                _timeout = timeout
-                _terminated = False
-            End Sub
-
-            Public Sub run()
-                SyncLock Me
-                    While Not _terminated
-                        System.Threading.Monitor.Wait(Me, _timeout)
-                        If _terminated Then
-                            Exit While
-                        End If
-                        Try
-                            _session.keepAlive()
-                        Catch ex As Ice.Exception
-                            Exit While
-                        End Try
-                    End While
-                End SyncLock
-            End Sub
-
-            Public Sub terminate()
-                SyncLock Me
-                    _terminated = True
-                    System.Threading.Monitor.Pulse(Me)
-                End SyncLock
-            End Sub
-
-            Private _session As IceGrid.SessionPrx
-            Private _timeout As Integer
-            Private _terminated As Boolean
-        End Class
-
-        Private Sub menu()
-            Console.WriteLine("usage:")
-            Console.WriteLine("t: send greeting")
-            Console.WriteLine("s: shutdown server")
-            Console.WriteLine("x: exit")
-            Console.WriteLine("?: help")
-        End Sub
-
-        Public Overloads Overrides Function run(ByVal args() As String) As Integer
-            Dim status As Integer = 0
-            Dim registry As IceGrid.RegistryPrx
-            registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
-            If registry Is Nothing Then
-                Console.Error.WriteLine("could not contact registry")
-            End If
-
-            Dim session As IceGrid.SessionPrx = Nothing
-            While True
-                Console.Out.WriteLine("This demo accepts any user-id / password combination.")
-
-                Console.Out.Write("user id: ")
-                Console.Out.Flush()
-                Dim id As String = Console.In.ReadLine()
-
-                Console.Out.Write("password: ")
-                Console.Out.Flush()
-                Dim pw As String = Console.In.ReadLine()
-
-                Try
-                    session = registry.createSession(id, pw)
-                    Exit While
-                Catch ex As IceGrid.PermissionDeniedException
-                    Console.Error.WriteLine("permission denied:\n" + ex.reason)
-                End Try
-            End While
-
-            Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
-            Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
-            keepAliveThread.Start()
-
-            Try
-                Dim hello As HelloPrx = Nothing
-                Try
-                    hello = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
-                Catch ex As IceGrid.ObjectNotRegisteredException
-                    hello = HelloPrxHelper.checkedCast(session.allocateObjectByType("::Demo::Hello"))
-                End Try
-
-                menu()
-
-                Dim line As String = Nothing
-                Do
-                    Try
-                        Console.Out.Write("==> ")
-                        Console.Out.Flush()
-                        line = Console.In.ReadLine()
-                        If line Is Nothing Then
-                            Exit Do
-                        End If
-                        If line.Equals("t") Then
-                            hello.sayHello()
-                        ElseIf line.Equals("s") Then
-                            hello.shutdown()
-                        ElseIf line.Equals("x") Then
-                            ' Nothing to do
-                        ElseIf line.Equals("?") Then
-                            menu()
-                        Else
-                            Console.WriteLine("unknown command `" & line & "'")
-                            menu()
-                        End If
-                    Catch ex As System.Exception
-                        Console.Error.WriteLine(ex)
-                    End Try
-                Loop While Not line.Equals("x")
-            Catch ex As IceGrid.AllocationException
-                Console.Error.WriteLine("could not allocate object: " + ex.reason)
-                status = 1
-            Catch ex As Exception
-                Console.Error.WriteLine("unexpected exception: " + ex.ToString())
-                status = 1
-            End Try
-
-            '

-            ' Destroy the keepAlive thread and the sesion object otherwise

-            ' the session will be kept allocated until the timeout occurs.

-            ' Destroying the session will release all allocated objects.

-            '
-            keepAlive.terminate()
-            keepAliveThread.Join()
-            session.destroy()
-
-            Return status
-        End Function
-    End Class
-
-    Public Sub Main(ByVal args() As String)
-        Dim app As Client = New Client
-        Dim status As Integer = app.Main(args, "config.client")
-        System.Environment.Exit(status)
-    End Sub
-End Module
diff --git a/vb/demo/IceGrid/allocate/Hello.ice b/vb/demo/IceGrid/allocate/Hello.ice
deleted file mode 100644
index f6e0682d2a6..00000000000
--- a/vb/demo/IceGrid/allocate/Hello.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/vb/demo/IceGrid/allocate/HelloI.vb b/vb/demo/IceGrid/allocate/HelloI.vb
deleted file mode 100755
index b9d2ae639b4..00000000000
--- a/vb/demo/IceGrid/allocate/HelloI.vb
+++ /dev/null
@@ -1,30 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Imports Allocate.Demo
-
-Public Class HelloI
-    Inherits HelloDisp_
-
-    Public Sub New(ByVal name As String)
-        _name = name
-    End Sub
-
-    Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
-        System.Console.Out.WriteLine(_name + " says Hello World!")
-    End Sub
-
-    Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
-        System.Console.Out.WriteLine(_name + " shutting down...")
-        current.adapter.getCommunicator().shutdown()
-    End Sub
-
-    Private _name As String
-
-End Class
diff --git a/vb/demo/IceGrid/allocate/Makefile.mak b/vb/demo/IceGrid/allocate/Makefile.mak
deleted file mode 100644
index 032db657647..00000000000
--- a/vb/demo/IceGrid/allocate/Makefile.mak
+++ /dev/null
@@ -1,36 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.vb
-S_SRCS		= HelloI.vb Server.vb
-
-GEN_SRCS	= $(GDIR)\Hello.vb
-
-SLICE_SRCS	= $(SDIR)/Hello.ice
-
-SDIR		= .
-
-GDIR		= generated
-
-!include $(top_srcdir)\config\Make.rules.mak.vb
-
-VBCFLAGS	= $(VBCFLAGS) -target:exe -rootnamespace:Allocate
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(VBC) $(VBCFLAGS) -out:$@ -r:$(csbindir)\icecs.dll -r:$(csbindir)\icegridcs.dll -r:$(csbindir)\glacier2cs.dll \
-		$(C_SRCS) $(GEN_SRCS)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(VBC) $(VBCFLAGS) -out:$@ -r:$(csbindir)\icecs.dll $(S_SRCS) $(GEN_SRCS)
-
-!include .depend
diff --git a/vb/demo/IceGrid/allocate/README b/vb/demo/IceGrid/allocate/README
deleted file mode 100644
index a9cb5b67f83..00000000000
--- a/vb/demo/IceGrid/allocate/README
+++ /dev/null
@@ -1,35 +0,0 @@
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-This demo contains two application descriptor files. The first
-descriptor, application-single.xml, contains a single server and
-object. This object is allocated by the client using the
-allocateObjectById operation. Only one client can access this object
-at a time. All other clients will hang until the object is released.
-Use the following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-single.xml'"
-
-The second descriptor, application-multiple.xml, contains two servers,
-each with an object. The clients retrieve these objects using
-allocateObjectByType. Since there are two objects available, two
-clients can get access simultaneously. Additional clients will hang
-until one of the clients with an allocated object releases it. Use the
-following command to deploy this descriptor:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application-multiple.xml'"
-
-To run the client type:
-
-$ client.exe
-
-If you have already deployed the application, you can update it to try
-a different set of descriptors, for example:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application update 'application-multiple.xml'"
-
-Messages will be displayed in the IceGrid service window.
diff --git a/vb/demo/IceGrid/allocate/Server.vb b/vb/demo/IceGrid/allocate/Server.vb
deleted file mode 100755
index 121226b489b..00000000000
--- a/vb/demo/IceGrid/allocate/Server.vb
+++ /dev/null
@@ -1,31 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Module AllocateS
-
-    Class Server
-        Inherits Ice.Application
-
-        Public Overloads Overrides Function run(ByVal args() As String) As Integer
-            Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
-            Dim properties As Ice.Properties = communicator().getProperties()
-            Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
-            adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
-            adapter.activate()
-            communicator.waitForShutdown()
-            Return 0
-        End Function
-    End Class
-
-    Public Sub Main(ByVal args() As String)
-        Dim app As Server = New Server
-        Dim status As Integer = app.Main(args)
-        System.Environment.Exit(status)
-    End Sub
-End Module
diff --git a/vb/demo/IceGrid/allocate/allocateC.vbproj b/vb/demo/IceGrid/allocate/allocateC.vbproj
deleted file mode 100755
index 87acdc70c73..00000000000
--- a/vb/demo/IceGrid/allocate/allocateC.vbproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{19705E43-F8B3-492F-B6A5-26527AB13696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>client</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>

-    </RootNamespace>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Console</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>client.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>client.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="glacier2cs">

-      <Name>glacier2cs</Name>

-      <HintPath>..\..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="icegridcs">

-      <Name>icegridcs</Name>

-      <HintPath>..\..\..\bin\icegridcs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-    <ProjectReference Include="allocateCommon.vbproj">

-      <Name>allocateCommon</Name>

-      <Project>{1970E9BD-6EF1-47AD-AB67-E5357AE83696}</Project>

-      <Package>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</Package>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Client.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/IceGrid/allocate/allocateCommon.vbproj b/vb/demo/IceGrid/allocate/allocateCommon.vbproj
deleted file mode 100755
index 641d0985588..00000000000
--- a/vb/demo/IceGrid/allocate/allocateCommon.vbproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{1970E9BD-6EF1-47AD-AB67-E5357AE83696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>allocateCommon</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>allocate</RootNamespace>

-    <StartupObject>allocate.%28None%29</StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Windows</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>allocateCommon.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>allocateCommon.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="generated\Hello.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/IceGrid/allocate/allocateS.vbproj b/vb/demo/IceGrid/allocate/allocateS.vbproj
deleted file mode 100755
index 32ce3d9d9da..00000000000
--- a/vb/demo/IceGrid/allocate/allocateS.vbproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{19702542-A745-4752-8D53-565BC7A93696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>server</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>allocate</RootNamespace>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Console</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>server.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>server.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-    <ProjectReference Include="allocateCommon.vbproj">

-      <Name>allocateCommon</Name>

-      <Project>{1970E9BD-6EF1-47AD-AB67-E5357AE83696}</Project>

-      <Package>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</Package>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="HelloI.vb">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Server.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/IceGrid/allocate/application-multiple.xml b/vb/demo/IceGrid/allocate/application-multiple.xml
deleted file mode 100644
index c05335fe136..00000000000
--- a/vb/demo/IceGrid/allocate/application-multiple.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <server-template id="AllocateServer">
-      <parameter name="index"/>
-      <server id="AllocateServer-${index}" exe="./server.exe" activation="on-demand">
-        <adapter name="Hello" endpoints="tcp" register-process="true">
-          <allocatable identity="hello-${index}" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </server-template>
-
-    <node name="localhost">
-      <server-instance template="AllocateServer" index="1"/>
-      <server-instance template="AllocateServer" index="2"/>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/vb/demo/IceGrid/allocate/application-single.xml b/vb/demo/IceGrid/allocate/application-single.xml
deleted file mode 100644
index ec0a14bf401..00000000000
--- a/vb/demo/IceGrid/allocate/application-single.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Allocate">
-
-    <node name="localhost">
-      <server id="AllocateServer" exe="./server.exe" activation="on-demand">
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" type="::Demo::Hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/vb/demo/IceGrid/allocate/client.exe.config b/vb/demo/IceGrid/allocate/client.exe.config
deleted file mode 100755
index 7bb2f5e41ed..00000000000
--- a/vb/demo/IceGrid/allocate/client.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>

-  <configuration>

-    <runtime>

-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-        <dependentAssembly>

-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/glacier2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icecs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icepatch2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icestormcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/iceboxcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icegridcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icesslcs.dll"/>

-        </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-</configuration>

diff --git a/vb/demo/IceGrid/allocate/config.client b/vb/demo/IceGrid/allocate/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/vb/demo/IceGrid/allocate/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/vb/demo/IceGrid/allocate/config.grid b/vb/demo/IceGrid/allocate/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/vb/demo/IceGrid/allocate/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/vb/demo/IceGrid/allocate/db/node/.gitignore b/vb/demo/IceGrid/allocate/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/allocate/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/allocate/db/registry/.gitignore b/vb/demo/IceGrid/allocate/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/allocate/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/allocate/generated/.gitignore b/vb/demo/IceGrid/allocate/generated/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/allocate/generated/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/allocate/server.exe.config b/vb/demo/IceGrid/allocate/server.exe.config
deleted file mode 100755
index 7bb2f5e41ed..00000000000
--- a/vb/demo/IceGrid/allocate/server.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>

-  <configuration>

-    <runtime>

-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-        <dependentAssembly>

-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/glacier2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icecs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icepatch2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icestormcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/iceboxcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icegridcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icesslcs.dll"/>

-        </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-</configuration>

diff --git a/vb/demo/IceGrid/sessionActivation/.depend b/vb/demo/IceGrid/sessionActivation/.depend
deleted file mode 100644
index 75ff6587933..00000000000
--- a/vb/demo/IceGrid/sessionActivation/.depend
+++ /dev/null
@@ -1 +0,0 @@
-Hello.vb: ./Hello.ice

diff --git a/vb/demo/IceGrid/sessionActivation/Client.vb b/vb/demo/IceGrid/sessionActivation/Client.vb
deleted file mode 100755
index 294b4dcabb0..00000000000
--- a/vb/demo/IceGrid/sessionActivation/Client.vb
+++ /dev/null
@@ -1,151 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Imports SessionActivation.Demo
-Imports System
-Imports System.Threading
-
-Module SessionActivationC
-
-    Class Client
-        Inherits Ice.Application
-
-        Class SessionKeepAliveThread
-
-            Public Sub New(ByVal session As IceGrid.SessionPrx, ByVal timeout As Long)
-                _session = session
-                _timeout = 5000
-                _terminated = False
-            End Sub
-
-            Public Sub run()
-                SyncLock Me
-                    While Not _terminated
-                        System.Threading.Monitor.Wait(Me, _timeout)
-                        If _terminated Then
-                            Exit While
-                        End If
-                        Try
-                            _session.keepAlive()
-                        Catch ex As Ice.Exception
-                            Exit While
-                        End Try
-                    End While
-                End SyncLock
-            End Sub
-
-            Public Sub terminate()
-                SyncLock Me
-                    _terminated = True
-                    System.Threading.Monitor.Pulse(Me)
-                End SyncLock
-            End Sub
-
-            Private _session As IceGrid.SessionPrx
-            Private _timeout As Integer
-            Private _terminated As Boolean
-        End Class
-
-        Private Sub menu()
-            Console.WriteLine("usage:")
-            Console.WriteLine("t: send greeting")
-            Console.WriteLine("x: exit")
-            Console.WriteLine("?: help")
-        End Sub
-
-        Public Overloads Overrides Function run(ByVal args() As String) As Integer
-            Dim status As Integer = 0
-            Dim registry As IceGrid.RegistryPrx
-            registry = IceGrid.RegistryPrxHelper.checkedCast(communicator().stringToProxy("DemoIceGrid/Registry"))
-            If registry Is Nothing Then
-                Console.Error.WriteLine("could not contact registry")
-            End If
-
-            Dim session As IceGrid.SessionPrx = Nothing
-            While True
-                Console.Out.WriteLine("This demo accepts any user-id / password combination.")
-
-                Console.Out.Write("user id: ")
-                Console.Out.Flush()
-                Dim id As String = Console.In.ReadLine()
-
-                Console.Out.Write("password: ")
-                Console.Out.Flush()
-                Dim pw As String = Console.In.ReadLine()
-
-                Try
-                    session = registry.createSession(id, pw)
-                    Exit While
-                Catch ex As IceGrid.PermissionDeniedException
-                    Console.Error.WriteLine("permission denied:\n" + ex.reason)
-                End Try
-            End While
-
-            Dim keepAlive As SessionKeepAliveThread = New SessionKeepAliveThread(session, registry.getSessionTimeout() / 2)
-            Dim keepAliveThread As Thread = New Thread(New ThreadStart(AddressOf keepAlive.run))
-            keepAliveThread.Start()
-
-            Try
-                Dim hello As HelloPrx = HelloPrxHelper.checkedCast(session.allocateObjectById(communicator().stringToIdentity("hello")))
-
-                menu()
-
-                Dim line As String = Nothing
-                Do
-                    Try
-                        Console.Out.Write("==> ")
-                        Console.Out.Flush()
-                        line = Console.In.ReadLine()
-                        If line Is Nothing Then
-                            Exit Do
-                        End If
-                        If line.Equals("t") Then
-                            hello.sayHello()
-                        ElseIf line.Equals("x") Then
-                            ' Nothing to do
-                        ElseIf line.Equals("?") Then
-                            menu()
-                        Else
-                            Console.WriteLine("unknown command `" & line & "'")
-                            menu()
-                        End If
-                    Catch ex As System.Exception
-                        Console.Error.WriteLine(ex)
-                    End Try
-                Loop While Not line.Equals("x")
-            Catch ex As IceGrid.AllocationException
-                Console.Error.WriteLine("could not allocate object: " + ex.reason)
-                status = 1
-            Catch ex As IceGrid.ObjectNotRegisteredException
-                Console.Error.WriteLine("object not registered with registry")
-                status = 1
-            Catch ex As Exception
-                Console.Error.WriteLine("unexpected exception: " + ex.ToString())
-                status = 1
-            End Try
-
-            '

-            ' Destroy the keepAlive thread and the sesion object otherwise

-            ' the session will be kept allocated until the timeout occurs.

-            ' Destroying the session will release all allocated objects.

-            '
-            keepAlive.terminate()
-            keepAliveThread.Join()
-            session.destroy()
-
-            Return status
-        End Function
-    End Class
-
-    Public Sub Main(ByVal args() As String)
-        Dim app As Client = New Client
-        Dim status As Integer = app.Main(args, "config.client")
-        System.Environment.Exit(status)
-    End Sub
-End Module
diff --git a/vb/demo/IceGrid/sessionActivation/Hello.ice b/vb/demo/IceGrid/sessionActivation/Hello.ice
deleted file mode 100644
index f6e0682d2a6..00000000000
--- a/vb/demo/IceGrid/sessionActivation/Hello.ice
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef HELLO_ICE
-#define HELLO_ICE
-
-module Demo
-{
-
-interface Hello
-{
-    idempotent void sayHello();
-    void shutdown();
-};
-
-};
-
-#endif
diff --git a/vb/demo/IceGrid/sessionActivation/HelloI.vb b/vb/demo/IceGrid/sessionActivation/HelloI.vb
deleted file mode 100755
index 37865089422..00000000000
--- a/vb/demo/IceGrid/sessionActivation/HelloI.vb
+++ /dev/null
@@ -1,30 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Imports SessionActivation.Demo
-
-Public Class HelloI
-    Inherits HelloDisp_
-
-    Public Sub New(ByVal name As String)
-        _name = name
-    End Sub
-
-    Public Overloads Overrides Sub sayHello(ByVal current As Ice.Current)
-        System.Console.Out.WriteLine(_name + " says Hello World!")
-    End Sub
-
-    Public Overloads Overrides Sub shutdown(ByVal current As Ice.Current)
-        System.Console.Out.WriteLine(_name + " shutting down...")
-        current.adapter.getCommunicator().shutdown()
-    End Sub
-
-    Private _name As String
-
-End Class
diff --git a/vb/demo/IceGrid/sessionActivation/Makefile.mak b/vb/demo/IceGrid/sessionActivation/Makefile.mak
deleted file mode 100644
index b082520738e..00000000000
--- a/vb/demo/IceGrid/sessionActivation/Makefile.mak
+++ /dev/null
@@ -1,36 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-TARGETS		= client.exe server.exe
-
-C_SRCS		= Client.vb
-S_SRCS		= HelloI.vb Server.vb
-
-GEN_SRCS	= $(GDIR)\Hello.vb
-
-SLICE_SRCS	= $(SDIR)/Hello.ice
-
-SDIR		= .
-
-GDIR		= generated
-
-!include $(top_srcdir)\config\Make.rules.mak.vb
-
-VBCFLAGS	= $(VBCFLAGS) -target:exe -rootnamespace:SessionActivation
-
-client.exe: $(C_SRCS) $(GEN_SRCS)
-	$(VBC) $(VBCFLAGS) -out:$@ -r:$(csbindir)\icecs.dll -r:$(csbindir)\icegridcs.dll -r:$(csbindir)\glacier2cs.dll \
-		$(C_SRCS) $(GEN_SRCS)
-
-server.exe: $(S_SRCS) $(GEN_SRCS)
-	$(VBC) $(VBCFLAGS) -out:$@ -r:$(csbindir)\icecs.dll $(S_SRCS) $(GEN_SRCS)
-
-!include .depend
diff --git a/vb/demo/IceGrid/sessionActivation/README b/vb/demo/IceGrid/sessionActivation/README
deleted file mode 100644
index b11fe4d6418..00000000000
--- a/vb/demo/IceGrid/sessionActivation/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This demo demonstrates the use of the session activation mode where
-the server is activated on demand once it is allocated by the client
-and deactivated when the client releases the server.
-
-To run the demo, first start the IceGrid service:
-
-$ icegridnode --Ice.Config=config.grid
-
-In a separate window:
-
-$ icegridadmin --Ice.Config=config.grid -e \
-    "application add 'application.xml'"
-$ client.exe
-
-This will deploy the application described in the file
-"application.xml" and start the client.
-
-Messages will be displayed in the IceGrid service window.
diff --git a/vb/demo/IceGrid/sessionActivation/Server.vb b/vb/demo/IceGrid/sessionActivation/Server.vb
deleted file mode 100755
index 12645b4a46e..00000000000
--- a/vb/demo/IceGrid/sessionActivation/Server.vb
+++ /dev/null
@@ -1,31 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-'
-' This copy of Ice is licensed to you under the terms described in the
-' ICE_LICENSE file included in this distribution.
-'
-' **********************************************************************
-
-Module SessionActivationS
-
-    Class Server
-        Inherits Ice.Application
-
-        Public Overloads Overrides Function run(ByVal args() As String) As Integer
-            Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("Hello")
-            Dim properties As Ice.Properties = communicator().getProperties()
-            Dim id As Ice.Identity = communicator().stringToIdentity(properties.getProperty("Identity"))
-            adapter.add(New HelloI(properties.getProperty("Ice.ServerId")), id)
-            adapter.activate()
-            communicator.waitForShutdown()
-            Return 0
-        End Function
-    End Class
-
-    Public Sub Main(ByVal args() As String)
-        Dim app As Server = New Server
-        Dim status As Integer = app.Main(args)
-        System.Environment.Exit(status)
-    End Sub
-End Module
diff --git a/vb/demo/IceGrid/sessionActivation/application.xml b/vb/demo/IceGrid/sessionActivation/application.xml
deleted file mode 100644
index 8affc428aca..00000000000
--- a/vb/demo/IceGrid/sessionActivation/application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<icegrid>
-
-  <application name="Session">
-
-    <node name="localhost">
-      <server id="SessionServer" exe="./server" activation="session">
-	<adapter name="Hello" endpoints="tcp" register-process="true">
-	  <allocatable identity="hello" property="Identity"/>
-	</adapter>
-      </server>
-    </node>
-
-  </application>
-
-</icegrid>
diff --git a/vb/demo/IceGrid/sessionActivation/client.exe.config b/vb/demo/IceGrid/sessionActivation/client.exe.config
deleted file mode 100755
index 7bb2f5e41ed..00000000000
--- a/vb/demo/IceGrid/sessionActivation/client.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>

-  <configuration>

-    <runtime>

-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-        <dependentAssembly>

-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/glacier2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icecs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icepatch2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icestormcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/iceboxcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icegridcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icesslcs.dll"/>

-        </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-</configuration>

diff --git a/vb/demo/IceGrid/sessionActivation/config.client b/vb/demo/IceGrid/sessionActivation/config.client
deleted file mode 100644
index 78100695847..00000000000
--- a/vb/demo/IceGrid/sessionActivation/config.client
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/vb/demo/IceGrid/sessionActivation/config.grid b/vb/demo/IceGrid/sessionActivation/config.grid
deleted file mode 100644
index 3ca2082ddfb..00000000000
--- a/vb/demo/IceGrid/sessionActivation/config.grid
+++ /dev/null
@@ -1,42 +0,0 @@
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# The IceGrid locator proxy.
-#
-Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.Data=db/registry
-IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-IceGrid.Registry.SSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier
-
-#
-# IceGrid node configuration.
-#
-IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
-IceGrid.Node.Data=db/node
-IceGrid.Node.CollocateRegistry=1
-#IceGrid.Node.Output=db
-#IceGrid.Node.RedirectErrToOut=1
-
-#
-# Trace properties.
-#
-IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
-#IceGrid.Node.Trace.Adapter=2
-#IceGrid.Node.Trace.Server=3
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=foo
-IceGridAdmin.Password=bar
diff --git a/vb/demo/IceGrid/sessionActivation/db/node/.gitignore b/vb/demo/IceGrid/sessionActivation/db/node/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/sessionActivation/db/node/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/sessionActivation/db/registry/.gitignore b/vb/demo/IceGrid/sessionActivation/db/registry/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/sessionActivation/db/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/sessionActivation/generated/.gitignore b/vb/demo/IceGrid/sessionActivation/generated/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/vb/demo/IceGrid/sessionActivation/generated/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/vb/demo/IceGrid/sessionActivation/server.exe.config b/vb/demo/IceGrid/sessionActivation/server.exe.config
deleted file mode 100755
index 7bb2f5e41ed..00000000000
--- a/vb/demo/IceGrid/sessionActivation/server.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>

-  <configuration>

-    <runtime>

-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-        <dependentAssembly>

-          <assemblyIdentity name="glacier2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/glacier2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icecs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icecs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icepatch2cs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icepatch2cs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icestormcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icestormcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="iceboxcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/iceboxcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icegridcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icegridcs.dll"/>

-        </dependentAssembly>

-        <dependentAssembly>

-          <assemblyIdentity name="icesslcs" culture="neutral" publicKeyToken="1f998c50fec78381"/>

-          <codeBase version="3.2.0.0" href="..\..\../../icecs/bin/icesslcs.dll"/>

-        </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-</configuration>

diff --git a/vb/demo/IceGrid/sessionActivation/sessionActivationC.vbproj b/vb/demo/IceGrid/sessionActivation/sessionActivationC.vbproj
deleted file mode 100755
index 32078f285c4..00000000000
--- a/vb/demo/IceGrid/sessionActivation/sessionActivationC.vbproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{22675E43-F8B3-492F-B6A5-26527AB13696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>client</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>

-    </RootNamespace>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Console</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>client.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>client.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="glacier2cs">

-      <Name>glacier2cs</Name>

-      <HintPath>..\..\..\bin\glacier2cs.dll</HintPath>

-    </Reference>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="icegridcs">

-      <Name>icegridcs</Name>

-      <HintPath>..\..\..\bin\icegridcs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-    <ProjectReference Include="sessionActivationCommon.vbproj">

-      <Name>sessionActivationCommon</Name>

-      <Project>{2267E9BD-6EF1-47AD-AB67-E5357AE83696}</Project>

-      <Package>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</Package>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Client.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/IceGrid/sessionActivation/sessionActivationCommon.vbproj b/vb/demo/IceGrid/sessionActivation/sessionActivationCommon.vbproj
deleted file mode 100755
index 0f0d5c0bd5b..00000000000
--- a/vb/demo/IceGrid/sessionActivation/sessionActivationCommon.vbproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{2267E9BD-6EF1-47AD-AB67-E5357AE83696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>sessionActivationCommon</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Library</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>sessionActivation</RootNamespace>

-    <StartupObject>sessionActivation.%28None%29</StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Windows</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>sessionActivationCommon.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>sessionActivationCommon.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="generated\Hello.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/IceGrid/sessionActivation/sessionActivationS.vbproj b/vb/demo/IceGrid/sessionActivation/sessionActivationS.vbproj
deleted file mode 100755
index f203dff2ad0..00000000000
--- a/vb/demo/IceGrid/sessionActivation/sessionActivationS.vbproj
+++ /dev/null
@@ -1,107 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectType>Local</ProjectType>

-    <ProductVersion>8.0.50727</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{22672542-A745-4752-8D53-565BC7A93696}</ProjectGuid>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

-    <AssemblyKeyContainerName>

-    </AssemblyKeyContainerName>

-    <AssemblyName>server</AssemblyName>

-    <AssemblyOriginatorKeyFile>

-    </AssemblyOriginatorKeyFile>

-    <AssemblyOriginatorKeyMode>None</AssemblyOriginatorKeyMode>

-    <DefaultClientScript>JScript</DefaultClientScript>

-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

-    <DefaultTargetSchema>IE50</DefaultTargetSchema>

-    <DelaySign>false</DelaySign>

-    <OutputType>Exe</OutputType>

-    <OptionCompare>Binary</OptionCompare>

-    <OptionExplicit>On</OptionExplicit>

-    <OptionStrict>Off</OptionStrict>

-    <RootNamespace>sessionActivation</RootNamespace>

-    <StartupObject>

-    </StartupObject>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <MyType>Console</MyType>

-    <UpgradeBackupLocation>

-    </UpgradeBackupLocation>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>server.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>true</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>true</DebugSymbols>

-    <Optimize>false</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>full</DebugType>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <OutputPath>.\</OutputPath>

-    <DocumentationFile>server.xml</DocumentationFile>

-    <BaseAddress>285212672</BaseAddress>

-    <ConfigurationOverrideFile>

-    </ConfigurationOverrideFile>

-    <DefineConstants>

-    </DefineConstants>

-    <DefineDebug>false</DefineDebug>

-    <DefineTrace>true</DefineTrace>

-    <DebugSymbols>false</DebugSymbols>

-    <Optimize>true</Optimize>

-    <RegisterForComInterop>false</RegisterForComInterop>

-    <RemoveIntegerChecks>false</RemoveIntegerChecks>

-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

-    <WarningLevel>1</WarningLevel>

-    <NoWarn>42016,42017,42018,42019,42032</NoWarn>

-    <DebugType>none</DebugType>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="icecs">

-      <Name>icecs</Name>

-      <HintPath>..\..\..\bin\icecs.dll</HintPath>

-    </Reference>

-    <Reference Include="System">

-      <Name>System</Name>

-    </Reference>

-    <ProjectReference Include="sessionActivationCommon.vbproj">

-      <Name>sessionActivationCommon</Name>

-      <Project>{2267E9BD-6EF1-47AD-AB67-E5357AE83696}</Project>

-      <Package>{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</Package>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Import Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="HelloI.vb">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Server.vb">

-      <SubType>Code</SubType>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="README" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />

-  <PropertyGroup>

-    <PreBuildEvent>

-    </PreBuildEvent>

-    <PostBuildEvent>

-    </PostBuildEvent>

-  </PropertyGroup>

-</Project>
\ No newline at end of file
diff --git a/vb/demo/README b/vb/demo/README
index d7b680f86e2..1d456b217c3 100644
--- a/vb/demo/README
+++ b/vb/demo/README
@@ -5,3 +5,6 @@ on the various demos.
 
 The book directory contains demos for some of the code examples in
 "Distributed Programming with Ice".
+
+For more examples of the features of the Ice services (Glacier2, IceGrid,
+IceStorm) please see the demos in the Ice for C++ distibution.
diff --git a/vb/demo/demo.sln b/vb/demo/demo.sln
index 507dcdd8759..d3ba7bb1f63 100755
--- a/vb/demo/demo.sln
+++ b/vb/demo/demo.sln
@@ -196,24 +196,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "simpleIceGridCommon", "IceG
 EndProject

 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "simpleIceGridS", "IceGrid\simple\simpleIceGridS.vbproj", "{E42D2542-A745-4752-8D53-565BC7A93696}"

 EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "sessionActivationC", "IceGrid\sessionActivation\sessionActivationC.vbproj", "{22675E43-F8B3-492F-B6A5-26527AB13696}"

-EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "sessionActivationCommon", "IceGrid\sessionActivation\sessionActivationCommon.vbproj", "{2267E9BD-6EF1-47AD-AB67-E5357AE83696}"

-	ProjectSection(ProjectDependencies) = postProject

-		{F47C2D68-B976-4D14-B4D5-E563001011D1} = {F47C2D68-B976-4D14-B4D5-E563001011D1}

-	EndProjectSection

-EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "sessionActivationS", "IceGrid\sessionActivation\sessionActivationS.vbproj", "{22672542-A745-4752-8D53-565BC7A93696}"

-EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "allocateC", "IceGrid\allocate\allocateC.vbproj", "{19705E43-F8B3-492F-B6A5-26527AB13696}"

-EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "allocateCommon", "IceGrid\allocate\allocateCommon.vbproj", "{1970E9BD-6EF1-47AD-AB67-E5357AE83696}"

-	ProjectSection(ProjectDependencies) = postProject

-		{F47C2D68-B976-4D14-B4D5-E563001011D1} = {F47C2D68-B976-4D14-B4D5-E563001011D1}

-	EndProjectSection

-EndProject

-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "allocateS", "IceGrid\allocate\allocateS.vbproj", "{19702542-A745-4752-8D53-565BC7A93696}"

-EndProject

 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "clockC", "IceStorm\clock\clockC.vbproj", "{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}"

 EndProject

 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "clockCommon", "IceStorm\clock\clockCommon.vbproj", "{BD0D11C9-CE32-424E-AAEA-F6296372B674}"

@@ -718,66 +700,6 @@ Global
 		{E42D2542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

 		{E42D2542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

 		{E42D2542-A745-4752-8D53-565BC7A93696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{22675E43-F8B3-492F-B6A5-26527AB13696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{2267E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{22672542-A745-4752-8D53-565BC7A93696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{19705E43-F8B3-492F-B6A5-26527AB13696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{1970E9BD-6EF1-47AD-AB67-E5357AE83696}.Release|Win32.ActiveCfg = Release|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Debug|Win32.ActiveCfg = Debug|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Release|Any CPU.Build.0 = Release|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Release|Mixed Platforms.Build.0 = Release|Any CPU

-		{19702542-A745-4752-8D53-565BC7A93696}.Release|Win32.ActiveCfg = Release|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E76D1D8E-7154-461D-BAFA-A3BB2E5D6D7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU