21 files changed, 0 insertions, 1679 deletions
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
deleted file mode 100644
index ec07ab3877..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.sln
+++ /dev/null
@@ -1,52 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca", "tuscany_sca\tuscany_sca.vcproj", "{2FC1B037-C30C-4B63-949E-B7467529671F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_test", "tuscany_sca_test\tuscany_sca_test.vcproj", "{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_test_CustomerInfo", "tuscany_sca_test_CustomerInfo\tuscany_sca_test_CustomerInfo.vcproj", "{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_test_MyValue", "tuscany_sca_test_MyValue\tuscany_sca_test_MyValue.vcproj", "{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_ws_service", "tuscany_sca_ws_service\tuscany_sca_ws_service.vcproj", "{A5943537-08D7-4A51-A7F0-B24400810738}"
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.0 = {A5943537-08D7-4A51-A7F0-B24400810738}
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.1 = {664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.2 = {4CA34112-DC16-42E5-B6C6-66742E4F5CE1}
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.3 = {2FC1B037-C30C-4B63-949E-B7467529671F}
-		{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}.0 = {2FC1B037-C30C-4B63-949E-B7467529671F}
-		{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}.0 = {2FC1B037-C30C-4B63-949E-B7467529671F}
-		{A5943537-08D7-4A51-A7F0-B24400810738}.0 = {2FC1B037-C30C-4B63-949E-B7467529671F}
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{2FC1B037-C30C-4B63-949E-B7467529671F}.Debug.ActiveCfg = Debug|Win32
-		{2FC1B037-C30C-4B63-949E-B7467529671F}.Debug.Build.0 = Debug|Win32
-		{2FC1B037-C30C-4B63-949E-B7467529671F}.Release.ActiveCfg = Release|Win32
-		{2FC1B037-C30C-4B63-949E-B7467529671F}.Release.Build.0 = Release|Win32
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.Debug.ActiveCfg = Debug|Win32
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.Debug.Build.0 = Debug|Win32
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.Release.ActiveCfg = Release|Win32
-		{2E87E2DB-3BE9-4FCF-9D16-9725A62A6BC5}.Release.Build.0 = Release|Win32
-		{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}.Debug.ActiveCfg = Debug|Win32
-		{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}.Debug.Build.0 = Debug|Win32
-		{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}.Release.ActiveCfg = Release|Win32
-		{4CA34112-DC16-42E5-B6C6-66742E4F5CE1}.Release.Build.0 = Release|Win32
-		{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}.Debug.ActiveCfg = Debug|Win32
-		{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}.Debug.Build.0 = Debug|Win32
-		{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}.Release.ActiveCfg = Release|Win32
-		{664DD6E6-B551-45D3-83A9-49FFAEB4A4D2}.Release.Build.0 = Release|Win32
-		{A5943537-08D7-4A51-A7F0-B24400810738}.Debug.ActiveCfg = Debug|Win32
-		{A5943537-08D7-4A51-A7F0-B24400810738}.Debug.Build.0 = Debug|Win32
-		{A5943537-08D7-4A51-A7F0-B24400810738}.Release.ActiveCfg = Release|Win32
-		{A5943537-08D7-4A51-A7F0-B24400810738}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo
deleted file mode 100644
index 71c843b643..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca.suo
+++ /dev/null
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt
deleted file mode 100644
index 847dd5d492..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/Build Instructions.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Tuscany SCA Build Instructions
-==============================
-
-1) Set the environment variable TUSCANY_SDOCPP to the path of an SDO driver
-
-2) Set the environment variable AXIS2C_HOME to the path of Axis2C (Version 0.92)
-
-NOTE: The environment variables must be set BEFORE launching Visual Studio
-
-3) Rebuild Solution
-
-The output for the build will be in deploy\include, lib and bin
-
-To run the test from a command prompt:
-
-1) Set the environment variable TUSCANY_SCACPP to the location of the built SCA
-   (...tuscany\cpp\sca\deploy)
-
-2) Set the environment variable TUSCANY_SCACPP_SYSTEM_ROOT to the location of the test system
-   ...tuscany\cpp\sca\projects\tuscany_sca\tuscany_sca_test\testSCASystem
-
-3) Add %TUSCANY_SCACPP%\lib and %TUSCANY_SDOCPP%\lib to the PATH
-   (ensure required libraries for SDO are also on the path. e.g. libxml2)
-
-4) cd %TUSCANY_SCACPP%\..\projects\tuscany_sca\tuscany_sca_test\Debug
-
-5) tuscany_sca_test
-
-NOTE: To run the test from the workspace the environment variables must be set 
-      BEFORE launching Visual Studio
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
deleted file mode 100644
index a83144e12a..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="tuscany_sca"
-	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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,$(AXIS2C_HOME)/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCA_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/tuscany_sca.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="axis2_engine.lib tuscany_sdo_axiom.lib odbc32.lib odbccp32.lib tuscany_sdo.lib axis2_parser.lib axis2_util.lib axiom.lib"
-				OutputFile=".\Release/tuscany_sca.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)\lib,$(AXIS2C_HOME)\lib"
-				ProgramDatabaseFile=".\Release/tuscany_sca.pdb"
-				ImportLibrary=".\Release/tuscany_sca.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/tuscany_sca.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				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\osoa mkdir ..\..\..\deploy\include\osoa
-if not exist ..\..\..\deploy\include\osoa\sca  mkdir ..\..\..\deploy\include\osoa\sca
-if not exist ..\..\..\deploy\include\tuscany mkdir ..\..\..\deploy\include\tuscany
-if not exist ..\..\..\deploy\include\tuscany\sca mkdir ..\..\..\deploy\include\tuscany\sca
-if not exist ..\..\..\deploy\include\tuscany\sca\core mkdir ..\..\..\deploy\include\tuscany\sca\core
-if not exist ..\..\..\deploy\include\tuscany\sca\model mkdir ..\..\..\deploy\include\tuscany\sca\model
-if not exist ..\..\..\deploy\include\tuscany\sca\util mkdir ..\..\..\deploy\include\tuscany\sca\util
-if not exist ..\..\..\deploy\include\tuscany\sca\ws mkdir ..\..\..\deploy\include\tuscany\sca\ws
-if not exist ..\..\..\deploy\xsd mkdir ..\..\..\deploy\xsd
-
-del ..\..\..\deploy\bin\tuscany_sca.*
-del ..\..\..\deploy\lib\*.lib
-copy ..\..\..\runtime\core\src\osoa\sca\*.h ..\..\..\deploy\include\osoa\sca
-copy ..\..\..\runtime\core\src\tuscany\sca\core\*.h ..\..\..\deploy\include\tuscany\sca\core
-copy ..\..\..\runtime\core\src\tuscany\sca\model\*.h ..\..\..\deploy\include\tuscany\sca\model
-copy ..\..\..\runtime\core\src\tuscany\sca\util\*.h ..\..\..\deploy\include\tuscany\sca\util
-copy ..\..\..\runtime\core\src\tuscany\sca\ws\*.h ..\..\..\deploy\include\tuscany\sca\ws
-copy Release\tuscany_sca.dll ..\..\..\deploy\bin
-copy Release\tuscany_sca.pdb ..\..\..\deploy\bin
-copy Release\tuscany_sca.lib ..\..\..\deploy\lib
-copy ..\..\..\xsd\*.* ..\..\..\deploy\xsd
-
-"/>
-			<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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,$(AXIS2C_HOME)/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCA_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/tuscany_sca.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_engine.lib tuscany_sdo_axiom.lib odbc32.lib odbccp32.lib tuscany_sdo.lib axis2_parser.lib axis2_util.lib axiom.lib"
-				OutputFile=".\Debug/tuscany_sca.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)\lib,$(AXIS2C_HOME)\lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/tuscany_sca.pdb"
-				ImportLibrary=".\Debug/tuscany_sca.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/tuscany_sca.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				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\osoa mkdir ..\..\..\deploy\include\osoa
-if not exist ..\..\..\deploy\include\osoa\sca  mkdir ..\..\..\deploy\include\osoa\sca
-if not exist ..\..\..\deploy\include\tuscany mkdir ..\..\..\deploy\include\tuscany
-if not exist ..\..\..\deploy\include\tuscany\sca mkdir ..\..\..\deploy\include\tuscany\sca
-if not exist ..\..\..\deploy\include\tuscany\sca\core mkdir ..\..\..\deploy\include\tuscany\sca\core
-if not exist ..\..\..\deploy\include\tuscany\sca\model mkdir ..\..\..\deploy\include\tuscany\sca\model
-if not exist ..\..\..\deploy\include\tuscany\sca\util mkdir ..\..\..\deploy\include\tuscany\sca\util
-if not exist ..\..\..\deploy\include\tuscany\sca\ws mkdir ..\..\..\deploy\include\tuscany\sca\ws
-if not exist ..\..\..\deploy\xsd mkdir ..\..\..\deploy\xsd
-
-del ..\..\..\deploy\bin\tuscany_sca.*
-del ..\..\..\deploy\lib\*.lib
-copy ..\..\..\runtime\core\src\osoa\sca\*.h ..\..\..\deploy\include\osoa\sca
-copy ..\..\..\runtime\core\src\tuscany\sca\core\*.h ..\..\..\deploy\include\tuscany\sca\core
-copy ..\..\..\runtime\core\src\tuscany\sca\model\*.h ..\..\..\deploy\include\tuscany\sca\model
-copy ..\..\..\runtime\core\src\tuscany\sca\util\*.h ..\..\..\deploy\include\tuscany\sca\util
-copy ..\..\..\runtime\core\src\tuscany\sca\ws\*.h ..\..\..\deploy\include\tuscany\sca\ws
-copy Debug\tuscany_sca.dll ..\..\..\deploy\bin
-copy Debug\tuscany_sca.pdb ..\..\..\deploy\bin
-copy Debug\tuscany_sca.lib ..\..\..\deploy\lib
-copy ..\..\..\xsd\*.* ..\..\..\deploy\xsd
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="osoa/sca"
-			Filter="">
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ComponentContext.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ComponentContext.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ComponentContextImpl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ComponentContextImpl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContext.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContext.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ModuleContextImpl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\SCA.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceList.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceList.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceRuntimeException.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\ServiceRuntimeException.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\export.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\src\osoa\sca\sca.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="tuscany/sca"
-			Filter="">
-			<Filter
-				Name="core"
-				Filter="">
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ComponentServiceWrapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ComponentServiceWrapper.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ExternalServiceWrapper.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\Operation.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCAEntryPoint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCARuntime.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\SCARuntime.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ServiceProxy.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ServiceProxy.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ServiceWrapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\ServiceWrapper.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\TuscanyRuntime.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\core\TuscanyRuntime.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="model"
-				Filter="">
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Binding.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Binding.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPImplementation.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\CPPInterface.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Component.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\EntryPoint.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ExternalService.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Implementation.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Implementation.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Interface.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Interface.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ModelLoader.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Module.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Module.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Service.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Service.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ServiceReference.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\ServiceReference.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Subsystem.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Subsystem.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\System.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\System.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WSBinding.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wire.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wire.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WireTarget.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WireTarget.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wsdl.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\Wsdl.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WsdlOperation.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\model\WsdlOperation.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="util"
-				Filter="">
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\DefaultLogWriter.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\DefaultLogWriter.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Exceptions.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\File.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\File.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\FileLogWriter.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\FileLogWriter.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Library.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Library.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\LogWriter.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logger.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Logging.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Utils.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\util\Utils.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="ws"
-				Filter="">
-				<File
-					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\Axis2Client.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\Axis2Client.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\EntryPointProxy.h">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\ws_reference\axis2c\src\WSServiceWrapper.cpp">
-				</File>
-				<File
-					RelativePath="..\..\..\runtime\core\src\tuscany\sca\ws\WSServiceWrapper.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="xsd"
-			Filter="">
-			<File
-				RelativePath="..\..\..\xsd\sca-binding-sca.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-binding-webservice.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-core.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-implementation-cpp.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-implementation-java.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-cpp.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-java.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca-interface-wsdl.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\sca.xsd">
-			</File>
-			<File
-				RelativePath="..\..\..\xsd\tuscany.xsd">
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\Build Instructions.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll
deleted file mode 100644
index 4ca1690be8..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.dll
+++ /dev/null
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
deleted file mode 100644
index c2c521ed96..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.fragment
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9" 
-	xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9" 
-	xmlns:mvs="http://www.myvalue.org/MyValueService/"
-	name="CustomerInfoComponent">
-
-
-	<component name="CustomerInfoComponent">
-		<implementation.cpp dll="CustomerInfo.dll" header="CustomerInfoImpl.h"></implementation.cpp>
-		<properties>
-			<v:Fred>x</v:Fred>
-			<v:Joe>23</v:Joe>
-			<Joe>42</Joe>
-		</properties>
-		<references>
-		</references>
-	</component>
-
-</moduleFragment>
-	
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb
deleted file mode 100644
index 61869285b1..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfo.pdb
+++ /dev/null
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
deleted file mode 100644
index 48651b63fe..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/CustomerInfoImpl.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/0.9"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<service name="CustomerInfoService">
-		<interface.cpp header="CustomerInfo.h">
-		</interface.cpp>
-	</service>
-
-	<property name="Fred" type="xs:string"/>
-	<property name="Joe" type="xs:integer" many="true"/>
-
-</componentType>
-	
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll
deleted file mode 100644
index e651ea0adb..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.dll
+++ /dev/null
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb
deleted file mode 100644
index 76b5bef92f..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValue.pdb
+++ /dev/null
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
deleted file mode 100644
index ace4154966..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueImpl.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/0.9">
-
-	<service name="MyValueService">
-		<interface.cpp header="MyValue.h">
-		</interface.cpp>
-	</service>
-
-	<reference name="customerInfo">
-		<interface.cpp header="CustomerInfo.h">
-		</interface.cpp>
-	</reference>
-
-	<reference name="stockQuote">
-		<interface.cpp header="StockQuoteService.h">
-		</interface.cpp>
-	</reference>
-
-</componentType>
-	
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
deleted file mode 100644
index f82690e1ab..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/MyValueService.wsdl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" 
-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-             xmlns:tns="http://www.myvalue.org/MyValueService/"
-             targetNamespace="http://www.myvalue.org/MyValueService/">
-    <types>
-		<xs:schema targetNamespace="http://www.myvalue.org/MyValueService/" 
-                   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                   xmlns:tns="http://www.myvalue.org/MyValueService/"
-                   elementFormDefault="qualified">
-        
-		<xs:element name="getMyValue">
-			<xs:complexType>
-				<xs:sequence>
-    				<xs:element name="customerID" type="xs:string" minOccurs="1"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-        
-		<xs:element name="getMyValueResponse">
-			<xs:complexType>
-				<xs:sequence>
-					<xs:element name="myValue" type="xs:float" minOccurs="1"/>
-				</xs:sequence>
-			</xs:complexType>
-		</xs:element>
-        
-        </xs:schema>
-   </types>
-           
-    <message name="getMyValueRequestMsg">
-	<part name="body" element="tns:getMyValue"/>
-    </message>
-	    
-    <message name="getMyValueResponseMsg">
-	<part name="body" element="tns:getMyValueResponse"/>
-    </message>
-    
-    <portType name="MyValueServicePortType">
-	<operation name="getMyValue">
-	    <input message="tns:getMyValueRequestMsg"/>
-	    <output message="tns:getMyValueResponseMsg"/>
-	</operation>
-    </portType>
-    
-    <binding name="MyValueServiceBinding" type="tns:MyValueServicePortType">
-	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-	<operation name="getMyValue">
-	    <soap:operation soapAction="MyValueService#getMyValue"/>
-	    <input>
-		<soap:body use="literal"/>
-	    </input>
-	    <output>
-		<soap:body use="literal"/>
-	    </output>
-	</operation>
-    </binding>
-    
-    <service name="MyValueService">
-	<port name="MyValueServicePort" binding="tns:MyValueServiceBinding">
-	    <soap:address location="http://localhost/axis/MyValueService"/>
-	</port>
-    </service>
-</definitions>
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
deleted file mode 100644
index 26e2ea5cb8..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteService.wsdl
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.webserviceX.NET/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www.webserviceX.NET/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://www.webserviceX.NET/">
-      <s:element name="GetQuote">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="symbol" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-
-      </s:element>
-      <s:element name="GetQuoteResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetQuoteResult" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="string" nillable="true" type="s:string" />
-
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="GetQuoteSoapIn">
-    <wsdl:part name="parameters" element="tns:GetQuote" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteSoapOut">
-    <wsdl:part name="parameters" element="tns:GetQuoteResponse" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpGetIn">
-
-    <wsdl:part name="symbol" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpGetOut">
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpPostIn">
-    <wsdl:part name="symbol" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpPostOut">
-
-    <wsdl:part name="Body" element="tns:string" />
-  </wsdl:message>
-  <wsdl:portType name="StockQuoteSoap">
-    <wsdl:operation name="GetQuote">
-      <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
-      <wsdl:input message="tns:GetQuoteSoapIn" />
-      <wsdl:output message="tns:GetQuoteSoapOut" />
-    </wsdl:operation>
-
-  </wsdl:portType>
-  <wsdl:portType name="StockQuoteHttpGet">
-    <wsdl:operation name="GetQuote">
-      <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
-      <wsdl:input message="tns:GetQuoteHttpGetIn" />
-      <wsdl:output message="tns:GetQuoteHttpGetOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <wsdl:portType name="StockQuoteHttpPost">
-    <wsdl:operation name="GetQuote">
-      <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
-      <wsdl:input message="tns:GetQuoteHttpPostIn" />
-      <wsdl:output message="tns:GetQuoteHttpPostOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="StockQuoteSoap" type="tns:StockQuoteSoap">
-
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-    <wsdl:operation name="GetQuote">
-      <soap:operation soapAction="http://www.webserviceX.NET/GetQuote" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="StockQuoteHttpGet" type="tns:StockQuoteHttpGet">
-    <http:binding verb="GET" />
-    <wsdl:operation name="GetQuote">
-      <http:operation location="/GetQuote" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="StockQuoteHttpPost" type="tns:StockQuoteHttpPost">
-    <http:binding verb="POST" />
-    <wsdl:operation name="GetQuote">
-      <http:operation location="/GetQuote" />
-
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="StockQuote">
-
-    <wsdl:port name="StockQuoteSoap" binding="tns:StockQuoteSoap">
-      <soap:address location="http://www.webservicex.net/stockquote.asmx" />
-    </wsdl:port>
-    <wsdl:port name="StockQuoteHttpGet" binding="tns:StockQuoteHttpGet">
-      <http:address location="http://www.webservicex.net/stockquote.asmx" />
-    </wsdl:port>
-    <wsdl:port name="StockQuoteHttpPost" binding="tns:StockQuoteHttpPost">
-      <http:address location="http://www.webservicex.net/stockquote.asmx" />
-    </wsdl:port>
-
-  </wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
deleted file mode 100644
index 5bce3a63dc..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/StockQuoteTypes.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!--
-  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="StockQuotes" type="tStockQuotes"/>
-  <xs:complexType name="tStockQuotes">
-    <xs:sequence>
-      <xs:element name="Stock" type="tStock" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:complexType name="tStock">
-    <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="1" name="Symbol"     type="xs:string"/>
-      <xs:element minOccurs="0" maxOccurs="1" name="Last"       type="xs:float"/>
-     <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##any" processContents="lax"/>
-  </xs:complexType>
-</xs:schema>
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
deleted file mode 100644
index a23cc3f5cd..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/Tuscany-model.config
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<tuscany-model xmlns="http://org.apache.tuscany/xmlns/cpp/1.0">
-	<wsdl>
-		<file name="MyValueService.wsdl"/>
- 		<file name="StockQuoteService.wsdl"/>
-	</wsdl>
-	<xsd>
-		<file name="StockQuoteTypes.xsd"/>
-	</xsd>
-</tuscany-model>
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
deleted file mode 100644
index 8cc39ce7bb..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/modules/MyValueServiceModule/sca.module
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" 
-	xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9" 
-	xmlns:mvs="http://www.myvalue.org/MyValueService/"
-	name="MyValueServiceModule">
-
-	<!-- Expose as a web service -->
-	<entryPoint name="MyValueServiceExport" multiplicity="1..1">
-		<interface.wsdl interface="MyValueService.wsdl" callbackInterface=""></interface.wsdl>
-		<binding.ws port="http://www.myvalue.org/MyValueService/#wsdl.endpoint(MyValueService/MyValueServicePort)"></binding.ws>
-		<reference>MyValueServiceComponent</reference>
-	</entryPoint>
-
-	<component name="MyValueServiceComponent">
-		<implementation.cpp dll="MyValue.dll" header="MyValueImpl.h"></implementation.cpp>
-		<properties>
-		</properties>
-		<references>
-			<stockQuote>StockQuoteService</stockQuote>
-		</references>
-	</component>
-
-	<externalService name="StockQuoteService">
-		<interface.cpp header="StockQuoteService.h"/>
-		<binding.ws port="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"/>
-	</externalService>
-
-	<wire>
-		<source.uri>MyValueServiceComponent/customerInfo</source.uri>
-		<target.uri>CustomerInfoComponent</target.uri>
-	</wire>
-
-</module>
-	
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
deleted file mode 100644
index 1b32bf8a93..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/testSCASystem/subsystems/SubSystem1/sca.subsystem
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
-<subsystem xmlns="http://www.osoa.org/xmlns/sca/0.9"
- 
-	name="SubSystem1">
-	
-	<moduleComponent name="MyValue" module="MyValueServiceModule">
-		
-	</moduleComponent>
-
-</subsystem>
-	
-\ No newline at end of file
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
deleted file mode 100644
index 1a1fc48b50..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test/tuscany_sca_test.vcproj
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="tuscany_sca_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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,../../../runtime/core/test/MyValue"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/tuscany_sca_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_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Release/tuscany_sca_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				ProgramDatabaseFile=".\Release/tuscany_sca_test.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/tuscany_sca_test.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\tuscany_sca_test_MyValue\Release\MyValue.dll testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Release\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
-"/>
-			<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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,../../../runtime/core/test/MyValue"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/tuscany_sca_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="odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Debug/tuscany_sca_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/tuscany_sca_test.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/tuscany_sca_test.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule
-copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule
-copy..\tuscany_sca\Debug\*.dll Debug
-copy..\tuscany_sca\Debug\*.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\src\TestSCA.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj
deleted file mode 100644
index 2bbb8e4cba..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_CustomerInfo/tuscany_sca_test_CustomerInfo.vcproj
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="tuscany_sca_test_CustomerInfo"
-	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,$(TUSCANY_SDOCPP)/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_TEST_CUSTOMERINFO_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/tuscany_sca_test_CustomerInfo.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 tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile="Debug/CustomerInfo.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/CustomerInfo.pdb"
-				ImportLibrary=".\Debug/CustomerInfo.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/tuscany_sca_test_CustomerInfo.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<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,$(TUSCANY_SDOCPP)/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_TEST_CUSTOMERINFO_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/tuscany_sca_test_CustomerInfo.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_sca.lib tuscany_sdo.lib"
-				OutputFile="Release/CustomerInfo.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				ProgramDatabaseFile=".\Release/CustomerInfo.pdb"
-				ImportLibrary=".\Release/CustomerInfo.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/tuscany_sca_test_CustomerInfo.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<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\test\CustomerInfo\CustomerInfoImpl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfoImpl_CustomerInfoService_Proxy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfoImpl_CustomerInfoService_Wrapper.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfo.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfoImpl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfoImpl_CustomerInfoService_Proxy.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\CustomerInfo\CustomerInfoImpl_CustomerInfoService_Wrapper.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/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj
deleted file mode 100644
index 7272352508..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_test_MyValue/tuscany_sca_test_MyValue.vcproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="tuscany_sca_test_MyValue"
-	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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,../../../runtime/core/test/CustomerInfo"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_TEST_MYVALUE_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/tuscany_sca_test_MyValue.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_sca.lib tuscany_sdo.lib"
-				OutputFile="Release/MyValue.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				ProgramDatabaseFile=".\Release/MyValue.pdb"
-				ImportLibrary=".\Release/MyValue.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/tuscany_sca_test_MyValue.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,../../../runtime/core/test/CustomerInfo"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_TEST_MYVALUE_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/tuscany_sca_test_MyValue.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 tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile="Debug/MyValue.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/MyValue.pdb"
-				ImportLibrary=".\Debug/MyValue.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/tuscany_sca_test_MyValue.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<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\MyValue\MyValueImpl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_MyValueService_Proxy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_MyValueService_Wrapper.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_customerInfo_Proxy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_stockQuote_Proxy.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValue.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_MyValueService_Proxy.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_MyValueService_Wrapper.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_customerInfo_Proxy.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\MyValueImpl_stockQuote_Proxy.h">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\core\test\MyValue\StockQuoteService.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/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj b/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
deleted file mode 100644
index 1619337c8f..0000000000
--- a/branches/cpp-M1/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="tuscany_sca_ws_service"
-	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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,$(AXIS2C_HOME)/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_WS_SERVICE_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/tuscany_sca_ws_service.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="axis2_util.lib axiom.lib odbc32.lib odbccp32.lib axis2_engine.lib tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Release/tuscany_sca_ws_service.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(AXIS2C_HOME)\lib"
-				ProgramDatabaseFile=".\Release/tuscany_sca_ws_service.pdb"
-				ImportLibrary=".\Release/tuscany_sca_ws_service.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/tuscany_sca_ws_service.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\tuscany_sca_ws_service.lib ..\..\..\deploy\lib
-copy Release\tuscany_sca_ws_service.dll ..\..\..\deploy\bin
-"/>
-			<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="../../../runtime/core/src,$(TUSCANY_SDOCPP)/include,$(AXIS2C_HOME)/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_WS_SERVICE_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/tuscany_sca_ws_service.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_util.lib axiom.lib odbc32.lib odbccp32.lib axis2_engine.lib tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib"
-				OutputFile=".\Debug/tuscany_sca_ws_service.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(AXIS2C_HOME)\lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/tuscany_sca_ws_service.pdb"
-				ImportLibrary=".\Debug/tuscany_sca_ws_service.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/tuscany_sca_ws_service.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Debug\tuscany_sca_ws_service.dll ..\..\..\deploy\bin
-copy Debug\tuscany_sca_ws_service.pdb ..\..\..\deploy\bin
-copy Debug\tuscany_sca_ws_service.lib ..\..\..\deploy\lib
-"/>
-			<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\ws_service\axis2c\src\Axis2EntryPointService_skeleton.cpp">
-			</File>
-			<File
-				RelativePath="..\..\..\runtime\ws_service\axis2c\src\Axis2Utils.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\runtime\ws_service\axis2c\src\Axis2Utils.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>