summaryrefslogtreecommitdiff
path: root/cs
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2007-06-19 12:44:27 -0230
committerDwayne Boone <dwayne@zeroc.com>2007-06-19 12:44:27 -0230
commitcf649bfffdf49c03cb1ea97a8e4777560266ad3a (patch)
tree4898cd2dd391506c9c594b0a094b7122aa5e2345 /cs
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2236 - Remove operator!= f... (diff)
downloadice-cf649bfffdf49c03cb1ea97a8e4777560266ad3a.tar.bz2
ice-cf649bfffdf49c03cb1ea97a8e4777560266ad3a.tar.xz
ice-cf649bfffdf49c03cb1ea97a8e4777560266ad3a.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1842 - Remove extra service demos from non-C++
Diffstat (limited to 'cs')
-rw-r--r--cs/demo/IceGrid/Makefile4
-rwxr-xr-xcs/demo/IceGrid/Makefile.mak4
-rw-r--r--cs/demo/IceGrid/README8
-rw-r--r--cs/demo/IceGrid/allocate/.depend1
-rw-r--r--cs/demo/IceGrid/allocate/.gitignore2
-rw-r--r--cs/demo/IceGrid/allocate/Client.cs203
-rw-r--r--cs/demo/IceGrid/allocate/Hello.ice24
-rw-r--r--cs/demo/IceGrid/allocate/HelloI.cs32
-rw-r--r--cs/demo/IceGrid/allocate/Makefile38
-rw-r--r--cs/demo/IceGrid/allocate/Makefile.mak40
-rw-r--r--cs/demo/IceGrid/allocate/README56
-rw-r--r--cs/demo/IceGrid/allocate/Server.cs32
-rwxr-xr-xcs/demo/IceGrid/allocate/allocateC.csproj111
-rwxr-xr-xcs/demo/IceGrid/allocate/allocateS.csproj110
-rw-r--r--cs/demo/IceGrid/allocate/application-multiple.xml32
-rw-r--r--cs/demo/IceGrid/allocate/application-single.xml26
-rwxr-xr-xcs/demo/IceGrid/allocate/client.exe.config35
-rw-r--r--cs/demo/IceGrid/allocate/config.client4
-rw-r--r--cs/demo/IceGrid/allocate/config.grid42
-rw-r--r--cs/demo/IceGrid/allocate/db/node/.gitignore1
-rw-r--r--cs/demo/IceGrid/allocate/db/registry/.gitignore1
-rw-r--r--cs/demo/IceGrid/allocate/generated/.gitignore1
-rwxr-xr-xcs/demo/IceGrid/allocate/server.exe.config35
-rw-r--r--cs/demo/IceGrid/sessionActivation/.depend1
-rw-r--r--cs/demo/IceGrid/sessionActivation/.gitignore2
-rw-r--r--cs/demo/IceGrid/sessionActivation/Client.cs195
-rw-r--r--cs/demo/IceGrid/sessionActivation/Hello.ice23
-rw-r--r--cs/demo/IceGrid/sessionActivation/HelloI.cs26
-rw-r--r--cs/demo/IceGrid/sessionActivation/Makefile38
-rw-r--r--cs/demo/IceGrid/sessionActivation/Makefile.mak40
-rw-r--r--cs/demo/IceGrid/sessionActivation/README38
-rw-r--r--cs/demo/IceGrid/sessionActivation/Server.cs32
-rw-r--r--cs/demo/IceGrid/sessionActivation/application.xml26
-rwxr-xr-xcs/demo/IceGrid/sessionActivation/client.exe.config35
-rw-r--r--cs/demo/IceGrid/sessionActivation/config.client4
-rw-r--r--cs/demo/IceGrid/sessionActivation/config.grid42
-rw-r--r--cs/demo/IceGrid/sessionActivation/db/node/.gitignore1
-rw-r--r--cs/demo/IceGrid/sessionActivation/db/registry/.gitignore1
-rw-r--r--cs/demo/IceGrid/sessionActivation/generated/.gitignore1
-rwxr-xr-xcs/demo/IceGrid/sessionActivation/server.exe.config35
-rwxr-xr-xcs/demo/IceGrid/sessionActivation/sessionActivationC.csproj111
-rwxr-xr-xcs/demo/IceGrid/sessionActivation/sessionActivationS.csproj110
-rw-r--r--cs/demo/README3
-rw-r--r--cs/demo/demo.sln24
44 files changed, 5 insertions, 1625 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