summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2009-09-11 09:49:32 -0230
committerMatthew Newhook <matthew@zeroc.com>2009-09-11 09:49:32 -0230
commitd984797af6bf462dc99f74ee1a550c3a2df1bf9d (patch)
tree04b8aeea5c6fa1364f1e6a633a77528cc28607c8
parentbug 3203 - enable NIO direct buffers (diff)
downloadice-d984797af6bf462dc99f74ee1a550c3a2df1bf9d.tar.bz2
ice-d984797af6bf462dc99f74ee1a550c3a2df1bf9d.tar.xz
ice-d984797af6bf462dc99f74ee1a550c3a2df1bf9d.zip
More updates for http://bugzilla/bugzilla/show_bug.cgi?id=2839
- Updated VS project files - Updated VB.
-rwxr-xr-xcpp/demo/Ice/session/Ice.session.server.vcproj36
-rwxr-xr-xcpp/demo/demo.sln13
-rwxr-xr-xcs/demo/demo.sln6
-rw-r--r--vb/demo/Glacier2/callback/Client.vb51
-rwxr-xr-xvb/demo/Glacier2/callback/Glacier2.callback.sessionserver.vbproj121
-rw-r--r--vb/demo/Glacier2/callback/README9
-rw-r--r--vb/demo/Glacier2/callback/SessionI.vb26
-rw-r--r--vb/demo/Glacier2/callback/SessionManagerI.vb21
-rw-r--r--vb/demo/Glacier2/callback/SessionServer.vb50
-rw-r--r--vb/demo/Glacier2/callback/config.glacier212
-rw-r--r--vb/demo/Glacier2/callback/config.sessionserver30
-rwxr-xr-xvb/demo/demo.sln6
12 files changed, 57 insertions, 324 deletions
diff --git a/cpp/demo/Ice/session/Ice.session.server.vcproj b/cpp/demo/Ice/session/Ice.session.server.vcproj
index 096ea5599a9..3a0c57827cc 100755
--- a/cpp/demo/Ice/session/Ice.session.server.vcproj
+++ b/cpp/demo/Ice/session/Ice.session.server.vcproj
@@ -401,40 +401,8 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="ReapThread.cpp"
+ RelativePath=".\ReapTask.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Server.cpp"
@@ -554,7 +522,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="ReapThread.h"
+ RelativePath=".\ReapTask.h"
>
</File>
<File
diff --git a/cpp/demo/demo.sln b/cpp/demo/demo.sln
index b6742d0a96b..a8169476262 100755
--- a/cpp/demo/demo.sln
+++ b/cpp/demo/demo.sln
@@ -66,11 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glacier2.callback.client",
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glacier2.callback.server", "Glacier2\callback\Glacier2.callback.server.vcproj", "{50C35E8E-3504-4DDF-8C5A-787525F16A91}"
- ProjectSection(ProjectDependencies) = postProject
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8} = {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glacier2.callback.sessionserver", "Glacier2\callback\Glacier2.callback.sessionserver.vcproj", "{5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glacier2.chat.client", "Glacier2\chat\Glacier2.chat.client.vcproj", "{3202DB5F-A249-4250-AB9D-EAA35AE386F1}"
ProjectSection(ProjectDependencies) = postProject
@@ -466,14 +461,6 @@ Global
{50C35E8E-3504-4DDF-8C5A-787525F16A91}.Release|Win32.Build.0 = Release|Win32
{50C35E8E-3504-4DDF-8C5A-787525F16A91}.Release|x64.ActiveCfg = Release|x64
{50C35E8E-3504-4DDF-8C5A-787525F16A91}.Release|x64.Build.0 = Release|x64
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Debug|Win32.ActiveCfg = Debug|Win32
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Debug|Win32.Build.0 = Debug|Win32
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Debug|x64.ActiveCfg = Debug|x64
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Debug|x64.Build.0 = Debug|x64
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Release|Win32.ActiveCfg = Release|Win32
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Release|Win32.Build.0 = Release|Win32
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Release|x64.ActiveCfg = Release|x64
- {5DC1F3F0-1269-4AFD-B4D3-E43798C194B8}.Release|x64.Build.0 = Release|x64
{3202DB5F-A249-4250-AB9D-EAA35AE386F1}.Debug|Win32.ActiveCfg = Debug|Win32
{3202DB5F-A249-4250-AB9D-EAA35AE386F1}.Debug|Win32.Build.0 = Debug|Win32
{3202DB5F-A249-4250-AB9D-EAA35AE386F1}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/cs/demo/demo.sln b/cs/demo/demo.sln
index 0597689bdd9..0e56951020e 100755
--- a/cs/demo/demo.sln
+++ b/cs/demo/demo.sln
@@ -28,8 +28,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glacier2.callback.client",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glacier2.callback.server", "Glacier2\callback\Glacier2.callback.server.csproj", "{E0C03A3C-1504-49B6-9C20-9B96DF17649E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glacier2.callback.sessionserver", "Glacier2\callback\Glacier2.callback.sessionserver.csproj", "{B41A6B60-9582-4814-9291-4758BEF1E9CC}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ice.async.client", "Ice\async\Ice.async.client.csproj", "{5678ADFF-7802-4A36-8374-C32DE33B0290}"
ProjectSection(ProjectDependencies) = postProject
{1234ADFF-7802-4A36-8374-C32DE33B0290} = {1234ADFF-7802-4A36-8374-C32DE33B0290}
@@ -209,10 +207,6 @@ Global
{E0C03A3C-1504-49B6-9C20-9B96DF17649E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0C03A3C-1504-49B6-9C20-9B96DF17649E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0C03A3C-1504-49B6-9C20-9B96DF17649E}.Release|Any CPU.Build.0 = Release|Any CPU
- {B41A6B60-9582-4814-9291-4758BEF1E9CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B41A6B60-9582-4814-9291-4758BEF1E9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B41A6B60-9582-4814-9291-4758BEF1E9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B41A6B60-9582-4814-9291-4758BEF1E9CC}.Release|Any CPU.Build.0 = Release|Any CPU
{5678ADFF-7802-4A36-8374-C32DE33B0290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5678ADFF-7802-4A36-8374-C32DE33B0290}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5678ADFF-7802-4A36-8374-C32DE33B0290}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/vb/demo/Glacier2/callback/Client.vb b/vb/demo/Glacier2/callback/Client.vb
index 4060fde3860..bcb2bf9dc91 100644
--- a/vb/demo/Glacier2/callback/Client.vb
+++ b/vb/demo/Glacier2/callback/Client.vb
@@ -9,12 +9,47 @@
Imports Demo
Imports System
+Imports System.Threading
Imports System.Collections.Generic
Module Glacier2callbackC
Class Client
Inherits Ice.Application
+ Class SessionRefreshThread
+
+ Public Sub New(ByVal router As Glacier2.RouterPrx, ByVal timeout As Integer)
+ _router = router
+ _timeout = timeout
+ _terminated = False
+ End Sub
+
+ Public Sub run()
+ SyncLock Me
+ While Not _terminated
+ System.Threading.Monitor.Wait(Me, _timeout)
+ If Not _terminated Then
+ Try
+ _router.refreshSession()
+ Catch ex As Ice.Exception
+ End Try
+ End If
+ End While
+ End SyncLock
+ End Sub
+
+ Public Sub terminate()
+ SyncLock Me
+ _terminated = True
+ System.Threading.Monitor.Pulse(Me)
+ End SyncLock
+ End Sub
+
+ Private _router As Glacier2.RouterPrx
+ Private _timeout As Integer
+ Private _terminated As Boolean
+ End Class
+
Private Sub menu()
Console.Out.WriteLine("usage:")
Console.Out.WriteLine("t: send callback as twoway")
@@ -70,6 +105,10 @@ Module Glacier2callbackC
End While
+ Dim refresh As SessionRefreshThread = New SessionRefreshThread(router, router.getSessionTimeout() / 2)
+ Dim refreshThread As Thread = New Thread(New ThreadStart(AddressOf refresh.run))
+ refreshThread.Start()
+
Dim category As String = router.getCategoryForClient()
Dim callbackReceiverIdent As Ice.Identity = New Ice.Identity
callbackReceiverIdent.name = "callbackReceiver"
@@ -162,8 +201,18 @@ Module Glacier2callbackC
End Try
Loop While Not line.Equals("x")
+ '
+ ' The refresher thread must be terminated before destroy Is
+ ' called, otherwIse it might get ObjectNotExIstException. refresh
+ ' Is set to 0 so that If session.destroy() raIses an exception
+ ' the thread will not be re-terminated and re-joined.
+ '
+ refresh.terminate()
+ refreshThread.Join()
+ refresh = Nothing
+
Try
- router.destroySession()
+ router.destroySession()
Catch ex As Glacier2.SessionNotExistException
Console.Error.WriteLine(ex)
Catch ex As Ice.ConnectionLostException
diff --git a/vb/demo/Glacier2/callback/Glacier2.callback.sessionserver.vbproj b/vb/demo/Glacier2/callback/Glacier2.callback.sessionserver.vbproj
deleted file mode 100755
index 1641a1dace4..00000000000
--- a/vb/demo/Glacier2/callback/Glacier2.callback.sessionserver.vbproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{10F1F272-4F37-400F-A1CF-8D68CAC629CD}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>sessionserver</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>
- <OldToolsVersion>2.0</OldToolsVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>.\</OutputPath>
- <DocumentationFile>sessionserver.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>sessionserver.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="Glacier2">
- <Name>Glacier2</Name>
- <HintPath>..\..\..\..\cs\bin\Glacier2.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="Ice">
- <Name>Ice</Name>
- <HintPath>..\..\..\..\cs\bin\Ice.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Import Include="System" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="SessionI.vb">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="SessionManagerI.vb">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="SessionServer.vb">
- <SubType>Code</SubType>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <None Include="README" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="My Project\" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <ProjectExtensions>
- <VisualStudio>
- <UserProperties ZerocIce_HomeExpanded="C:\Ice-3.3.1" ZerocIce_Home="C:\Ice-3.3.1" />
- </VisualStudio>
- </ProjectExtensions>
-</Project> \ No newline at end of file
diff --git a/vb/demo/Glacier2/callback/README b/vb/demo/Glacier2/callback/README
index a64c84c609c..aebeef9c077 100644
--- a/vb/demo/Glacier2/callback/README
+++ b/vb/demo/Glacier2/callback/README
@@ -1,14 +1,11 @@
-This example demonstrates the use of a Glacier2 router and the
-implementation of a Glacier2 session server.
+This example demonstrates the use of a Glacier2 router with a set of
+well known server objects. In this demo no Glacier2 session manager is
+used.
To run the demo, first start the server:
$ server.exe
-In a separate window, start the session server:
-
-$ sessionserver.exe
-
In a separate window, start the Glacier2 router:
$ glacier2router.exe --Ice.Config=config.glacier2
diff --git a/vb/demo/Glacier2/callback/SessionI.vb b/vb/demo/Glacier2/callback/SessionI.vb
deleted file mode 100644
index b269c763535..00000000000
--- a/vb/demo/Glacier2/callback/SessionI.vb
+++ /dev/null
@@ -1,26 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2009 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 System
-
-Public NotInheritable Class SessionI
- Inherits Glacier2.SessionDisp_
-
- Public Sub New(ByVal userId As String)
- _userId = userId
- End Sub
-
- Public Overloads Overrides Sub destroy(ByVal current As Ice.Current)
- Console.WriteLine("destroying session for user `" & _userId & "'")
- current.adapter.remove(current.id)
- End Sub
-
- Private ReadOnly _userId As String
-
-End Class
diff --git a/vb/demo/Glacier2/callback/SessionManagerI.vb b/vb/demo/Glacier2/callback/SessionManagerI.vb
deleted file mode 100644
index 8aa384f728e..00000000000
--- a/vb/demo/Glacier2/callback/SessionManagerI.vb
+++ /dev/null
@@ -1,21 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2009 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 System
-
-Public NotInheritable Class SessionManagerI
- Inherits Glacier2.SessionManagerDisp_
-
- Public Overloads Overrides Function create(ByVal userId As String, ByVal control As Glacier2.SessionControlPrx, ByVal current As Ice.Current) As Glacier2.SessionPrx
- Console.WriteLine("creating session for user `" & userId & "'")
- Dim session As Glacier2.Session = New SessionI(userId)
- Return Glacier2.SessionPrxHelper.uncheckedCast(current.adapter.addWithUUID(session))
- End Function
-
-End Class
diff --git a/vb/demo/Glacier2/callback/SessionServer.vb b/vb/demo/Glacier2/callback/SessionServer.vb
deleted file mode 100644
index 2fb46b127f1..00000000000
--- a/vb/demo/Glacier2/callback/SessionServer.vb
+++ /dev/null
@@ -1,50 +0,0 @@
-' **********************************************************************
-'
-' Copyright (c) 2003-2009 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 System
-
-Module Glacier2callbackSS
-
- NotInheritable Class DummyPermissionVerifierI
- Inherits Glacier2.PermissionsVerifierDisp_
-
- Public Overloads Overrides Function checkPermissions(ByVal userId As String, ByVal password As String, ByRef reason As String, ByVal current As Ice.Current) As Boolean
- reason = Nothing
- Console.WriteLine("verified user `" & userId & "' with password `" & password & "'")
- Return True
- End Function
-
- End Class
-
- Class Server
- Inherits Ice.Application
-
- Public Overloads Overrides Function run(ByVal args() As String) As Integer
- If args.Length > 0 Then
- Console.Error.WriteLine(appName() & ": too many arguments")
- Return 1
- End If
-
- Dim adapter As Ice.ObjectAdapter = communicator().createObjectAdapter("SessionServer")
- adapter.add(New DummyPermissionVerifierI, communicator().stringToIdentity("verifier"))
- adapter.add(New SessionManagerI, communicator().stringToIdentity("sessionmanager"))
- adapter.activate()
- communicator().waitForShutdown()
- Return 0
- End Function
-
- End Class
-
- Sub Main(ByVal args() As String)
- Dim app As Server = New Server
- Dim status As Integer = app.main(args, "config.sessionserver")
- Environment.Exit(status)
- End Sub
-
-End Module
diff --git a/vb/demo/Glacier2/callback/config.glacier2 b/vb/demo/Glacier2/callback/config.glacier2
index 15d550076bf..20987925507 100644
--- a/vb/demo/Glacier2/callback/config.glacier2
+++ b/vb/demo/Glacier2/callback/config.glacier2
@@ -19,17 +19,9 @@ Glacier2.Client.Endpoints=tcp -p 4063 -h 127.0.0.1:ssl -p 4064 -h 127.0.0.1
Glacier2.Server.Endpoints=tcp -h 127.0.0.1
#
-# The configures the session manager. If no external session manager
-# is used, sessions are only handled Glacier2 internally.
-#
-Glacier2.SessionManager=sessionmanager:tcp -h 127.0.0.1 -p 10001
-
-#
-# For this demo, we use a dummy permissions verifier that is
-# collocated with the session server process. This dummy permissions
-# verifier allows any user-id / password combination.
+# For this demo, we use a null permissions verifier.
#
-Glacier2.PermissionsVerifier=verifier:tcp -h 127.0.0.1 -p 10001
+Glacier2.PermissionsVerifier=DemoGlacier2/NullPermissionsVerifier
#
# The timeout for inactive sessions. If any client session is inactive
diff --git a/vb/demo/Glacier2/callback/config.sessionserver b/vb/demo/Glacier2/callback/config.sessionserver
deleted file mode 100644
index 864d6bd5720..00000000000
--- a/vb/demo/Glacier2/callback/config.sessionserver
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# The endpoint of the session server's object adapter. This should be
-# an endpoint on an internal network (like 192.168.x.x), or on the
-# loopback, so that the session server is not directly accessible from
-# the Internet.
-#
-SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
-
-#
-# Warn about connection exceptions
-#
-Ice.Warn.Connections=1
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
diff --git a/vb/demo/demo.sln b/vb/demo/demo.sln
index 08c6c43601f..621d66ae0e6 100755
--- a/vb/demo/demo.sln
+++ b/vb/demo/demo.sln
@@ -25,8 +25,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Glacier2.callback.client",
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Glacier2.callback.server", "Glacier2\callback\Glacier2.callback.server.vbproj", "{C726E767-E1F0-47DE-B00C-F70318DF22DC}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Glacier2.callback.sessionserver", "Glacier2\callback\Glacier2.callback.sessionserver.vbproj", "{10F1F272-4F37-400F-A1CF-8D68CAC629CD}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glacier2.callback.slice", "Glacier2\callback\Glacier2.callback.slice.csproj", "{218F2A2E-2CC5-4D61-B312-87B6EBB0FDC2}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Ice.async.client", "Ice\async\Ice.async.client.vbproj", "{123451A2-E26B-48E6-A4EA-828B9A2AD2B5}"
@@ -193,10 +191,6 @@ Global
{C726E767-E1F0-47DE-B00C-F70318DF22DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C726E767-E1F0-47DE-B00C-F70318DF22DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C726E767-E1F0-47DE-B00C-F70318DF22DC}.Release|Any CPU.Build.0 = Release|Any CPU
- {10F1F272-4F37-400F-A1CF-8D68CAC629CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {10F1F272-4F37-400F-A1CF-8D68CAC629CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {10F1F272-4F37-400F-A1CF-8D68CAC629CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {10F1F272-4F37-400F-A1CF-8D68CAC629CD}.Release|Any CPU.Build.0 = Release|Any CPU
{218F2A2E-2CC5-4D61-B312-87B6EBB0FDC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{218F2A2E-2CC5-4D61-B312-87B6EBB0FDC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{218F2A2E-2CC5-4D61-B312-87B6EBB0FDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU