4245 - Update oracle demos.

5 files changed, 76 insertions, 109 deletions

diff --git a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
index 35e27fc3749..4bac89163a7 100644
--- a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
+++ b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
@@ -86,11 +86,33 @@ private:
 
 }
 
+namespace
+{
+IceUtil::Mutex* _globalMutex = 0;
+class Init
+{
+public:
+
+	Init()
+	{
+             _globalMutex = new IceUtil::Mutex();
+	}
+	
+	~Init()
+	{
+	    delete _globalMutex;
+	    _globalMutex = 0;
+	}
+};
+
+Init init;
+}
+
 CurrentSqlContext::CurrentSqlContext(const string& connectInfo) :
     _connectInfo(connectInfo)
 {
     {
-        IceUtil::StaticMutex::Lock lock(IceUtil::globalMutex);
+        IceUtil::Mutex::Lock lock(*_globalMutex);
         _index = _currentIndex++;
     }
     _hook = new Notification(_index);
diff --git a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
index 5630f3d94d6..d4a17edbe38 100755
--- a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
+++ b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Database.Oracle.proc.client"

+	Version="9,00"

+	Name="Database.Oracle.proc"

 	ProjectGUID="{D92187DE-BAA2-4A40-B3FA-7CFC97DD3147}"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -42,7 +43,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"

+				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"

 				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -75,10 +76,12 @@
 				OutputFile="client.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="../../../../lib"

+				AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/client.pdb"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -102,9 +105,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -138,7 +138,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"

+				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"

 				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -170,8 +170,10 @@
 				OutputFile="client.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="../../../../lib"

+				AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -195,9 +197,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -232,26 +231,8 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="HR.cpp"

+				RelativePath=".\HR.cpp"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

@@ -259,7 +240,7 @@
 			Filter="h;hpp;hxx;hm;inl"

 			>

 			<File

-				RelativePath="HR.h"

+				RelativePath=".\HR.h"

 				>

 			</File>

 		</Filter>

@@ -268,28 +249,7 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 			>

 			<File

-				RelativePath="HR.ice"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"

-						AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\sliced.lib;"

-						Outputs="HR.h;HR.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"

-						AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\slice.lib;"

-						Outputs="HR.h;HR.cpp"

-					/>

-				</FileConfiguration>

+				RelativePath="HR.ice">

 			</File>

 		</Filter>

 		<File

@@ -298,5 +258,17 @@
 		</File>

 	</Files>

 	<Globals>

+		<Global

+			Name="ZerocIce_Enabled"

+			Value="True"

+		/>

+		<Global

+			Name="ZerocIce_Home"

+			Value="..\..\..\..\.."

+		/>

+		<Global

+			Name="ZerocIce_HomeExpanded"

+			Value="..\..\..\..\.."

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
index 23728192318..071d8f9450c 100755
--- a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
+++ b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Database.Oracle.proc.server"

+	Version="9,00"

+	Name="Database.Oracle.proc"

 	ProjectGUID="{135D833C-4166-4073-8DD0-B4DCC96C9A4E}"

+	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -43,7 +44,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"

+				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"

 				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -75,8 +76,10 @@
 				OutputFile="server.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="../../../../lib"

+				AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -100,9 +103,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -135,7 +135,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"

+				AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"

 				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -168,10 +168,12 @@
 				OutputFile="server.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="../../../../lib"

+				AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/server.pdb"

 				SubSystem="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

 				TargetMachine="1"

 			/>

 			<Tool

@@ -195,9 +197,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -298,26 +297,8 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="HR.cpp"

+				RelativePath=".\HR.cpp"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="Server.cpp"

@@ -385,7 +366,7 @@
 				>

 			</File>

 			<File

-				RelativePath="HR.h"

+				RelativePath=".\HR.h"

 				>

 			</File>

 			<File

@@ -488,26 +469,6 @@
 			<File

 				RelativePath="HR.ice"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"

-						AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\slice.lib;"

-						Outputs="HR.h;HR.cpp"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"

-						AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\sliced.lib;"

-						Outputs="HR.h;HR.cpp"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="Server.pc"

@@ -560,5 +521,17 @@
 		</File>

 	</Files>

 	<Globals>

+		<Global

+			Name="ZerocIce_Enabled"

+			Value="True"

+		/>

+		<Global

+			Name="ZerocIce_Home"

+			Value="..\..\..\..\.."

+		/>

+		<Global

+			Name="ZerocIce_HomeExpanded"

+			Value="..\..\..\..\.."

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/cpp/demo/Database/Oracle/proc/config.client b/cpp/demo/Database/Oracle/proc/config.client
index be8c63ec65c..0d3ec36413f 100644
--- a/cpp/demo/Database/Oracle/proc/config.client
+++ b/cpp/demo/Database/Oracle/proc/config.client
@@ -1 +1 @@
-HR.DeptFactory=DeptFactory:tcp -p 10000
+HR.DeptFactory=DeptFactory:tcp -p 12000
diff --git a/cpp/demo/Database/Oracle/proc/config.server b/cpp/demo/Database/Oracle/proc/config.server
index 735c720adc8..570921bf8fa 100644
--- a/cpp/demo/Database/Oracle/proc/config.server
+++ b/cpp/demo/Database/Oracle/proc/config.server
@@ -1,4 +1,4 @@
-HR.Endpoints=tcp -p 10000
+HR.Endpoints=tcp -p 12000
 
 Ice.ThreadPool.Server.Size=5