Cleaning up SVN structure, moving branch under sca-cpp/branches.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@880612 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 1373 insertions, 0 deletions

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt
new file mode 100644
index 0000000000..8d2e518ef8
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/build_instructions.txt
@@ -0,0 +1,28 @@
+Tuscany SDO Build Instructions
+===============================
+
+The project is dependent on libxml 
+(available here: http://www.zlatkovic.com/libxml.en.html) 
+
+The versions required are these:
+	libxml2-2.6.20.win32
+	iconv-1.9.1.win32
+	zlib-1.2.2.win32
+
+By default, the projects are set up to look for these in directories located by the 
+environment variables: LIBXML2_HOME, ICONV_HOME and ZLIB_HOME. These need to be set 
+before launching Visual Studio.
+
+The two projects sdo_axiom and sdo_axiom_test are dependent on AXIS2C, and require that
+an environment variable AXIS2C_HOME be set to where axis2c is installed. Axis2c can be 
+located at http://ws.apache.org/axis2/c/.
+
+Open the build solution \sdo\runtime\projectsvc7\tuscany_sdo\tuscany_sdo.sln
+
+Rebuild the solution
+
+There are several signed-unsigned mismatches which we are working to fix, but these 
+warnings should not cause any problems in running the project.
+
+NOTE:
+The output is copied to the deploy directory from both VC6 and VC7 builds.
\ No newline at end of file
diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
new file mode 100644
index 0000000000..6ac55e31fb
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom/sdo_axiom.vcproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="sdo_axiom"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\deploy\include,$(AXIS2C_HOME)\include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDO_AXIOM_EXPORTS"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\Release/sdo_axiom.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Release/tuscany_sdo_axiom.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(AXIS2C_HOME)\lib"

+				ProgramDatabaseFile=".\Release/tuscany_sdo_axiom.pdb"

+				ImportLibrary=".\Release/tuscany_sdo_axiom.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/sdo_axiom.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy    Release\tuscany_sdo_axiom.dll       ..\..\..\deploy\bin

+copy       Release\tuscany_sdo_axiom.lib       ..\..\..\deploy\lib

+copy       ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h       ..\..\..\deploy\include\

+copy       ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h       ..\..\..\deploy\include\

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\deploy\include,$(AXIS2C_HOME)\include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDO_AXIOM_EXPORTS"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\Debug/sdo_axiom.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib odbc32.lib odbccp32.lib"

+				OutputFile="Debug/tuscany_sdo_axiom.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(AXIS2C_HOME)\lib"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/tuscany_sdo_axiom.pdb"

+				ImportLibrary=".\Debug/tuscany_sdo_axiom.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/sdo_axiom.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy       Debug\tuscany_sdo_axiom.dll       ..\..\..\deploy\bin

+copy       Debug\tuscany_sdo_axiom.pdb       ..\..\..\deploy\bin

+copy       Debug\tuscany_sdo_axiom.lib       ..\..\..\deploy\lib

+copy       ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h       ..\..\..\deploy\include\

+copy       ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h       ..\..\..\deploy\include\

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\runtime\core\sdo_axiom\sdo_axiom.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\runtime\core\sdo_axiom\sdo_axiom.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
new file mode 100644
index 0000000000..075e7347fb
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.vcproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="sdo_axiom_test"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\deploy\include,$(AXIS2C_HOME)\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\Release/sdo_axiom_test.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="tuscany_sdo.lib tuscany_sdo_axiom.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Release/sdo_axiom_test.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				ProgramDatabaseFile=".\Release/sdo_axiom_test.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Release/sdo_axiom_test.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\deploy\bin\*.dll Release"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\deploy\include,$(AXIS2C_HOME)\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\Debug/sdo_axiom_test.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="tuscany_sdo.lib tuscany_sdo_axiom.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Debug/sdo_axiom_test.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/sdo_axiom_test.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Debug/sdo_axiom_test.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\deploy\bin\*.dll Debug 

+copy ..\..\..\deploy\bin\*.pdb Debug

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\runtime\core\sdo_axiom_test\sdo_axiom_test.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\runtime\core\sdo_axiom_test\sdo_axiom_test.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
new file mode 100644
index 0000000000..259d340520
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
@@ -0,0 +1,657 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="sdo_runtime"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\runtime\core\src,$(LIBXML2_HOME)\include,$(ICONV_HOME)\include,$(ZLIB_HOME)\include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDO_EXPORTS"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\Debug/sdo_runtime.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="odbc32.lib odbccp32.lib libxml2.lib"

+				OutputFile=".\Debug\tuscany_sdo.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="$(LIBXML2_HOME)\lib"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/tuscany_sdo.pdb"

+				ImportLibrary=".\Debug/tuscany_sdo.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\..\..\..\runtime\core\Debug/sdo_runtime.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="copyout"

+				CommandLine="if not exist ..\..\..\deploy mkdir ..\..\..\deploy

+if not exist ..\..\..\deploy\bin mkdir ..\..\..\deploy\bin

+if not exist ..\..\..\deploy\lib mkdir ..\..\..\deploy\lib

+if not exist ..\..\..\deploy\include mkdir ..\..\..\deploy\include

+if not exist ..\..\..\deploy\include\commonj  mkdir ..\..\..\deploy\include\commonj

+if not exist ..\..\..\deploy\include\commonj\sdo mkdir ..\..\..\deploy\include\commonj\sdo

+

+copy .\Debug\tuscany_sdo.dll ..\..\..\deploy\bin

+copy .\Debug\tuscany_sdo.lib ..\..\..\deploy\lib

+copy  ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo

+copy .\Debug\tuscany_sdo.pdb ..\..\..\deploy\bin

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\runtime\core\src,$(LIBXML2_HOME)\include,$(ICONV_HOME)\include,$(ZLIB_HOME)\include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDO_EXPORTS"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\Release/sdo_runtime.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="odbc32.lib odbccp32.lib libxml2.lib"

+				OutputFile=".\Release\tuscany_sdo.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="$(LIBXML2_HOME)\lib"

+				ProgramDatabaseFile=".\Release/tuscany_sdo.pdb"

+				ImportLibrary=".\Release/tuscany_sdo.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\..\..\..\runtime\core\Release/sdo_runtime.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				Description="copyout"

+				CommandLine="if not exist ..\..\..\deploy mkdir ..\..\..\deploy

+if not exist ..\..\..\deploy\bin mkdir ..\..\..\deploy\bin

+if not exist ..\..\..\deploy\lib mkdir ..\..\..\deploy\lib

+if not exist ..\..\..\deploy\include mkdir ..\..\..\deploy\include

+if not exist ..\..\..\deploy\include\commonj  mkdir ..\..\..\deploy\include\commonj

+if not exist ..\..\..\deploy\include\commonj\sdo mkdir ..\..\..\deploy\include\commonj\sdo

+

+copy .\Release\tuscany_sdo.dll ..\..\..\deploy\bin

+copy .\Release\tuscany_sdo.lib ..\..\..\deploy\lib

+copy  ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryBuilder.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectListImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\CopyHelper.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASProperty.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASType.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASValue.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASValues.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataFactory.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataFactoryImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataGraph.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataGraphImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObject.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectList.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectListImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\GroupDefinition.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\GroupEvent.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\HelperProvider.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\LogWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Logger.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ParserErrorSetter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Property.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyDefinitionImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyList.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertySetting.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Attribute.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Attributes.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Namespaces.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Parser.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDODate.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOSAX2Parser.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOSchemaSAX2Parser.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOString.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOUtils.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLBufferWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLFileWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLStreamWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLString.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDBufferWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDFileWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDStreamWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDWriter.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SchemaInfo.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SdoCheck.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SdoRuntime.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Sequence.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SequenceImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Setting.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SettingList.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Type.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionsImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeList.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLDocument.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLDocumentImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLHelper.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLHelperImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLQName.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDHelper.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDHelperImpl.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDPropertyInfo.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDTypeInfo.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XpathHelper.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryBuilder.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectList.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectListImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\CopyHelper.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASProperty.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASType.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASValue.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DASValues.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataFactory.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataFactoryImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataGraph.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataGraphImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObject.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectList.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DataObjectListImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\GroupDefinition.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\GroupEvent.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\HelperProvider.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\LogWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Logger.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Logging.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\ParserErrorSetter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Property.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyDefinitionImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertyList.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\PropertySetting.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Attribute.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Attributes.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Namespaces.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SAX2Parser.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDO.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDODate.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOSAX2Parser.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOSPI.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOSchemaSAX2Parser.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOString.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOUtils.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLBufferWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLFileWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLStreamWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLString.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXMLWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDBufferWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDFileWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDStreamWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SDOXSDWriter.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SchemaInfo.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SdoCheck.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SdoRuntime.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Sequence.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SequenceImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Setting.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\SettingList.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\Type.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionsImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\TypeList.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLDocument.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLDocumentImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLHelper.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLHelperImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XMLQName.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDHelper.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDHelperImpl.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDPropertyInfo.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XSDTypeInfo.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\XpathHelper.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\disable_warn.h">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\src\commonj\sdo\export.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+		<File

+			RelativePath="..\..\..\Committers Guide.txt">

+		</File>

+		<File

+			RelativePath="..\..\..\readme.txt">

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
new file mode 100644
index 0000000000..6a27381a8f
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_samples/sdo_samples.vcproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="sdo_samples"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\..\..\..\runtime\core\samples\Debug"

+			IntermediateDirectory=".\..\..\..\runtime\core\samples\Debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\deploy\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\..\..\..\runtime\core\samples\Debug/sdo_samples.pch"

+				AssemblerListingLocation=".\..\..\..\runtime\core\samples\Debug/"

+				ObjectFile=".\..\..\..\runtime\core\samples\Debug/"

+				ProgramDataBaseFileName=".\..\..\..\runtime\core\samples\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="tuscany_sdo.lib odbc32.lib odbccp32.lib"

+				OutputFile="..\..\..\runtime\core\samples\Debug/samples.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\..\..\..\runtime\core\samples\Debug/samples.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\runtime\core\samples\Debug/sdo_samples.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Debug

+copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Debug

+copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Debug

+copy ..\..\..\deploy\bin\*.pdb ..\..\..\runtime\core\samples\Debug

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\deploy\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				UsePrecompiledHeader="2"

+				PrecompiledHeaderFile=".\Release/sdo_samples.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="odbc32.lib odbccp32.lib tuscany_sdo.lib"

+				OutputFile=".\Release/sdo_samples.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				ProgramDatabaseFile=".\Release/sdo_samples.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\runtime\core\samples\Release/sdo_samples.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\runtime\core\samples\*.xsd .s\Release

+copy ..\..\..\runtime\core\samples\*.xml .\Release

+copy ..\..\..\runtime\core\samples\*.wsdl .\Release

+copy ..\..\..\deploy\bin\*.dll .\Release

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\runtime\core\samples\ChangeSummarySave.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\samples\ObjectCreation.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\samples\Query.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\samples\Substitutes.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\samples\XSDLoading.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\samples\samples.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\runtime\core\samples\samples.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
new file mode 100644
index 0000000000..825c1eb017
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/sdo_test/sdo_test.vcproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="sdo_test"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="..\..\..\deploy\include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"

+				StringPooling="TRUE"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="TRUE"

+				PrecompiledHeaderFile=".\Release/sdo_test.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="odbc32.lib odbccp32.lib tuscany_sdo.lib"

+				OutputFile=".\Release/sdo_test.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				ProgramDatabaseFile=".\Release/sdo_test.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\runtime\core\test\Release/sdo_test.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\deploy\bin\*.dll Release"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/Zm200 "

+				Optimization="0"

+				AdditionalIncludeDirectories="..\..\..\deploy\include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				PrecompiledHeaderFile=".\Debug/sdo_test.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="4"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="tuscany_sdo.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Debug/sdo_test.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="..\..\..\deploy\lib"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/sdo_test.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\..\..\..\runtime\core\test\Debug/sdo_test.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy ..\..\..\deploy\bin\*.dll Debug

+copy ..\..\..\deploy\bin\*.pdb Debug

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="2057"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\runtime\core\test\SdoGenerate.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\test\main.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\test\sdotest.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\test\sdotest2.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\runtime\core\test\utils.cpp">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\runtime\core\test\sdotest.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+		<File

+			RelativePath="..\build_instructions.txt">

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
new file mode 100644
index 0000000000..dd45b4bde6
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
@@ -0,0 +1,44 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_axiom", "sdo_axiom\sdo_axiom.vcproj", "{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_axiom_test", "sdo_axiom_test\sdo_axiom_test.vcproj", "{CE1FE92A-3F1C-4AD2-922C-E16703402234}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_runtime", "sdo_runtime\sdo_runtime.vcproj", "{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_test", "sdo_test\sdo_test.vcproj", "{C22D761C-F453-45EB-AA23-D13E2F3B786B}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+		{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.0 = {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.0 = {BF03BF2B-8F39-4458-8AD9-E3420988EFCA}

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.1 = {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.2 = {C22D761C-F453-45EB-AA23-D13E2F3B786B}

+		{C22D761C-F453-45EB-AA23-D13E2F3B786B}.0 = {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.Debug.ActiveCfg = Debug|Win32

+		{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.Debug.Build.0 = Debug|Win32

+		{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.Release.ActiveCfg = Release|Win32

+		{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.Release.Build.0 = Release|Win32

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.Debug.ActiveCfg = Debug|Win32

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.Debug.Build.0 = Debug|Win32

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.Release.ActiveCfg = Release|Win32

+		{CE1FE92A-3F1C-4AD2-922C-E16703402234}.Release.Build.0 = Release|Win32

+		{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}.Debug.ActiveCfg = Debug|Win32

+		{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}.Debug.Build.0 = Debug|Win32

+		{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}.Release.ActiveCfg = Release|Win32

+		{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}.Release.Build.0 = Release|Win32

+		{C22D761C-F453-45EB-AA23-D13E2F3B786B}.Debug.ActiveCfg = Debug|Win32

+		{C22D761C-F453-45EB-AA23-D13E2F3B786B}.Debug.Build.0 = Debug|Win32

+		{C22D761C-F453-45EB-AA23-D13E2F3B786B}.Release.ActiveCfg = Release|Win32

+		{C22D761C-F453-45EB-AA23-D13E2F3B786B}.Release.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
new file mode 100644
index 0000000000..161181fc60
--- /dev/null
+++ b/sca-cpp/branches/cpp-M1/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo