Move Tuscany from Incubator to top level.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668359 13f79535-47bb-0310-9956-ffa450edef68
author: dims <dims@13f79535-47bb-0310-9956-ffa450edef68> 2008-06-17 00:23:01 +0000
committer: dims <dims@13f79535-47bb-0310-9956-ffa450edef68> 2008-06-17 00:23:01 +0000
commit: bdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a (patch)
tree: 38a92061c0793434c4be189f1d70c3458b6bc41d /branches/cpp-M1/sdo/projects
14 files changed, 3155 insertions, 0 deletions
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd b/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd
new file mode 100644
index 0000000000..db38f34ce3
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/build.cmd
@@ -0,0 +1,20 @@
+@echo off
+
+@REM  Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+@REM
+@REM  Licensed under the Apache License, Version 2.0 (the "License");
+@REM  you may not use this file except in compliance with the License.
+@REM  You may obtain a copy of the License at
+@REM
+@REM     http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an "AS IS" BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+setlocal
+cd sdo_axiom_test
+NMAKE /f "sdo_axiom_test.mak" CFG="sdo_axiom_test - Win32 Release"
+cd ..
+endlocal
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt b/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt
new file mode 100644
index 0000000000..2c1a98394c
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/build_instructions.txt
@@ -0,0 +1,31 @@
+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/. Please read the axis2c documentation to ensure
+you have installed any pre-requisites.
+
+Open the build workspace tuscany\cpp\sdo\runtime\projects\tuscany_sdo\tuscany_sdo.dsw
+
+Build->Set Active Configuration->sdo_axiom_test - Win32 Release
+
+Build->Rebuild All
+
+The output of the build will be in runtime\core\Release.
+
+The executable, required headers and lib are copied to the deploy directory.
+
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
new file mode 100644
index 0000000000..23beda1539
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
@@ -0,0 +1,125 @@
+# Microsoft Developer Studio Project File - Name="sdo_axiom" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=sdo_axiom - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom.mak" CFG="sdo_axiom - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_axiom - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sdo_axiom - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sdo_axiom - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/tuscany_sdo_axiom.dll" /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=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
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "sdo_axiom - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/tuscany_sdo_axiom.dll" /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=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
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sdo_axiom - Win32 Release"
+# Name "sdo_axiom - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\sdo_axiom\sdo_axiom.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\sdo_axiom\sdo_axiom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
new file mode 100644
index 0000000000..64b4229ac5
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
@@ -0,0 +1,277 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on sdo_axiom.dsp
+!IF "$(CFG)" == ""
+CFG=sdo_axiom - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to sdo_axiom - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "sdo_axiom - Win32 Release" && "$(CFG)" != "sdo_axiom - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom.mak" CFG="sdo_axiom - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_axiom - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sdo_axiom - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_axiom - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\tuscany_sdo_axiom.dll"
+
+!ELSE 
+
+ALL : "sdo_runtime - Win32 Release" "$(OUTDIR)\tuscany_sdo_axiom.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_runtime - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\sdo_axiom.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.dll"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.exp"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_axiom.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\tuscany_sdo_axiom.pdb" /machine:I386 /out:"$(OUTDIR)\tuscany_sdo_axiom.dll" /implib:"$(OUTDIR)\tuscany_sdo_axiom.lib" /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\sdo_axiom.obj" \
+	"..\sdo_runtime\Release\tuscany_sdo.lib"
+
+"$(OUTDIR)\tuscany_sdo_axiom.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Release" "$(OUTDIR)\tuscany_sdo_axiom.dll"
+   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
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\tuscany_sdo_axiom.dll"
+
+!ELSE 
+
+ALL : "sdo_runtime - Win32 Debug" "$(OUTDIR)\tuscany_sdo_axiom.dll"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_runtime - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\sdo_axiom.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.dll"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.exp"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.ilk"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.lib"
+	-@erase "$(OUTDIR)\tuscany_sdo_axiom.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_axiom.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\tuscany_sdo_axiom.pdb" /debug /machine:I386 /out:"$(OUTDIR)\tuscany_sdo_axiom.dll" /implib:"$(OUTDIR)\tuscany_sdo_axiom.lib" /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\sdo_axiom.obj" \
+	"..\sdo_runtime\Debug\tuscany_sdo.lib"
+
+"$(OUTDIR)\tuscany_sdo_axiom.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Debug" "$(OUTDIR)\tuscany_sdo_axiom.dll"
+   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
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("sdo_axiom.dep")
+!INCLUDE "sdo_axiom.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "sdo_axiom.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "sdo_axiom - Win32 Release" || "$(CFG)" == "sdo_axiom - Win32 Debug"
+SOURCE=..\..\..\runtime\core\sdo_axiom\sdo_axiom.cpp
+
+"$(INTDIR)\sdo_axiom.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "sdo_axiom - Win32 Release"
+
+"sdo_runtime - Win32 Release" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" 
+   cd "..\sdo_axiom"
+
+"sdo_runtime - Win32 ReleaseCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom - Win32 Debug"
+
+"sdo_runtime - Win32 Debug" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" 
+   cd "..\sdo_axiom"
+
+"sdo_runtime - Win32 DebugCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
new file mode 100644
index 0000000000..2b75c42235
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
@@ -0,0 +1,116 @@
+# Microsoft Developer Studio Project File - Name="sdo_axiom_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=sdo_axiom_test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom_test.mak" CFG="sdo_axiom_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_axiom_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sdo_axiom_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sdo_axiom_test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 tuscany_sdo.lib tuscany_sdo_axiom.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\deploy\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Release
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 tuscany_sdo.lib tuscany_sdo_axiom.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\deploy\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Debug	copy ..\..\..\deploy\bin\*.pdb Debug
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sdo_axiom_test - Win32 Release"
+# Name "sdo_axiom_test - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\sdo_axiom_test\sdo_axiom_test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\sdo_axiom_test\sdo_axiom_test.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
new file mode 100644
index 0000000000..6d01d2e09c
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
@@ -0,0 +1,317 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on sdo_axiom_test.dsp
+!IF "$(CFG)" == ""
+CFG=sdo_axiom_test - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to sdo_axiom_test - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "sdo_axiom_test - Win32 Release" && "$(CFG)" != "sdo_axiom_test - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_axiom_test.mak" CFG="sdo_axiom_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_axiom_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sdo_axiom_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_axiom_test - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\sdo_axiom_test.exe"
+
+!ELSE 
+
+ALL : "sdo_test - Win32 Release" "sdo_runtime - Win32 Release" "sdo_axiom - Win32 Release" "$(OUTDIR)\sdo_axiom_test.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_axiom - Win32 ReleaseCLEAN" "sdo_runtime - Win32 ReleaseCLEAN" "sdo_test - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\sdo_axiom_test.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\sdo_axiom_test.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_axiom_test.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=tuscany_sdo.lib tuscany_sdo_axiom.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe" /libpath:"..\..\..\deploy\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\sdo_axiom_test.obj" \
+	"..\sdo_axiom\Release\tuscany_sdo_axiom.lib" \
+	"..\sdo_runtime\Release\tuscany_sdo.lib"
+
+"$(OUTDIR)\sdo_axiom_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_test - Win32 Release" "sdo_runtime - Win32 Release" "sdo_axiom - Win32 Release" "$(OUTDIR)\sdo_axiom_test.exe"
+   copy ..\..\..\deploy\bin\*.dll Release
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\sdo_axiom_test.exe"
+
+!ELSE 
+
+ALL : "sdo_test - Win32 Debug" "sdo_runtime - Win32 Debug" "sdo_axiom - Win32 Debug" "$(OUTDIR)\sdo_axiom_test.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_axiom - Win32 DebugCLEAN" "sdo_runtime - Win32 DebugCLEAN" "sdo_test - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\sdo_axiom_test.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\sdo_axiom_test.exe"
+	-@erase "$(OUTDIR)\sdo_axiom_test.ilk"
+	-@erase "$(OUTDIR)\sdo_axiom_test.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_axiom_test.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=tuscany_sdo.lib tuscany_sdo_axiom.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /debug /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\sdo_axiom_test.obj" \
+	"..\sdo_axiom\Debug\tuscany_sdo_axiom.lib" \
+	"..\sdo_runtime\Debug\tuscany_sdo.lib"
+
+"$(OUTDIR)\sdo_axiom_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_test - Win32 Debug" "sdo_runtime - Win32 Debug" "sdo_axiom - Win32 Debug" "$(OUTDIR)\sdo_axiom_test.exe"
+   copy ..\..\..\deploy\bin\*.dll Debug
+	copy ..\..\..\deploy\bin\*.pdb Debug
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("sdo_axiom_test.dep")
+!INCLUDE "sdo_axiom_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "sdo_axiom_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "sdo_axiom_test - Win32 Release" || "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+SOURCE=..\..\..\runtime\core\sdo_axiom_test\sdo_axiom_test.cpp
+
+"$(INTDIR)\sdo_axiom_test.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "sdo_axiom_test - Win32 Release"
+
+"sdo_axiom - Win32 Release" : 
+   cd "..\sdo_axiom"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_axiom.mak CFG="sdo_axiom - Win32 Release" 
+   cd "..\sdo_axiom_test"
+
+"sdo_axiom - Win32 ReleaseCLEAN" : 
+   cd "..\sdo_axiom"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_axiom.mak CFG="sdo_axiom - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+
+"sdo_axiom - Win32 Debug" : 
+   cd "..\sdo_axiom"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_axiom.mak CFG="sdo_axiom - Win32 Debug" 
+   cd "..\sdo_axiom_test"
+
+"sdo_axiom - Win32 DebugCLEAN" : 
+   cd "..\sdo_axiom"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_axiom.mak CFG="sdo_axiom - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_axiom_test - Win32 Release"
+
+"sdo_runtime - Win32 Release" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" 
+   cd "..\sdo_axiom_test"
+
+"sdo_runtime - Win32 ReleaseCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+
+"sdo_runtime - Win32 Debug" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" 
+   cd "..\sdo_axiom_test"
+
+"sdo_runtime - Win32 DebugCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_axiom_test - Win32 Release"
+
+"sdo_test - Win32 Release" : 
+   cd "..\sdo_test"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_test.mak CFG="sdo_test - Win32 Release" 
+   cd "..\sdo_axiom_test"
+
+"sdo_test - Win32 ReleaseCLEAN" : 
+   cd "..\sdo_test"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_test.mak CFG="sdo_test - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ELSEIF  "$(CFG)" == "sdo_axiom_test - Win32 Debug"
+
+"sdo_test - Win32 Debug" : 
+   cd "..\sdo_test"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_test.mak CFG="sdo_test - Win32 Debug" 
+   cd "..\sdo_axiom_test"
+
+"sdo_test - Win32 DebugCLEAN" : 
+   cd "..\sdo_test"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_test.mak CFG="sdo_test - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\sdo_axiom_test"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
new file mode 100644
index 0000000000..a72ac008e8
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
@@ -0,0 +1,763 @@
+# Microsoft Developer Studio Project File - Name="sdo_runtime" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=sdo_runtime - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_runtime.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_runtime.mak" CFG="sdo_runtime - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_runtime - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sdo_runtime - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sdo_runtime - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_RUNTIME_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libxml2.lib /nologo /dll /machine:I386 /out:"Release\tuscany_sdo.dll" /libpath:"$(LIBXML2_HOME)\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=copyout
+PostBuild_Cmds=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
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "sdo_runtime - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_RUNTIME_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libxml2.lib /nologo /dll /debug /machine:I386 /out:"Debug\tuscany_sdo.dll" /pdbtype:sept /libpath:"$(LIBXML2_HOME)\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=copyout
+PostBuild_Cmds=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
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sdo_runtime - Win32 Release"
+# Name "sdo_runtime - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectListImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryBuilder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\CopyHelper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASProperty.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASType.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValue.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValues.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactory.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactoryImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraph.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraphImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectListImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupDefinition.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupEvent.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\HelperProvider.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Logger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\LogWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ParserErrorSetter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Property.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinitionImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertySetting.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attribute.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attributes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Namespaces.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Parser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SchemaInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoCheck.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDODate.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoRuntime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSAX2Parser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSchemaSAX2Parser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLBufferWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLFileWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLStreamWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLString.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDBufferWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDFileWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDStreamWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDWriter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Sequence.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SequenceImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Setting.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SettingList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Type.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionsImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeList.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocument.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocumentImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelperImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLQName.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XpathHelper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelperImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDPropertyInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDTypeInfo.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectList.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectListImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryBuilder.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\CopyHelper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASProperty.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASType.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValues.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactoryImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraph.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraphImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectList.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectListImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\disable_warn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\export.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupDefinition.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupEvent.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\HelperProvider.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Logger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Logging.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\LogWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ParserErrorSetter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Property.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinitionImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyList.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertySetting.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attribute.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attributes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Namespaces.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SchemaInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDO.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoCheck.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDODate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoRuntime.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSAX2Parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSchemaSAX2Parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSPI.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOUtils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLBufferWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLFileWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLStreamWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLString.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDBufferWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDFileWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDStreamWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDWriter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Sequence.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SequenceImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Setting.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SettingList.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Type.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionsImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeList.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocumentImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelperImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLQName.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XpathHelper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelperImpl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDPropertyInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDTypeInfo.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE="..\..\..\Committers Guide.txt"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\readme.txt
+# End Source File
+# End Target
+# End Project
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
new file mode 100644
index 0000000000..92d2e19dac
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
@@ -0,0 +1,987 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on sdo_runtime.dsp
+!IF "$(CFG)" == ""
+CFG=sdo_runtime - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to sdo_runtime - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "sdo_runtime - Win32 Release" && "$(CFG)" != "sdo_runtime - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_runtime.mak" CFG="sdo_runtime - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_runtime - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "sdo_runtime - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_runtime - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\tuscany_sdo.dll"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ChangedDataObjectListImpl.obj"
+	-@erase "$(INTDIR)\ChangeSummary.obj"
+	-@erase "$(INTDIR)\ChangeSummaryBuilder.obj"
+	-@erase "$(INTDIR)\ChangeSummaryImpl.obj"
+	-@erase "$(INTDIR)\CopyHelper.obj"
+	-@erase "$(INTDIR)\DASProperty.obj"
+	-@erase "$(INTDIR)\DASType.obj"
+	-@erase "$(INTDIR)\DASValue.obj"
+	-@erase "$(INTDIR)\DASValues.obj"
+	-@erase "$(INTDIR)\DataFactory.obj"
+	-@erase "$(INTDIR)\DataFactoryImpl.obj"
+	-@erase "$(INTDIR)\DataGraph.obj"
+	-@erase "$(INTDIR)\DataGraphImpl.obj"
+	-@erase "$(INTDIR)\DataObject.obj"
+	-@erase "$(INTDIR)\DataObjectImpl.obj"
+	-@erase "$(INTDIR)\DataObjectInstance.obj"
+	-@erase "$(INTDIR)\DataObjectList.obj"
+	-@erase "$(INTDIR)\DataObjectListImpl.obj"
+	-@erase "$(INTDIR)\DefaultLogWriter.obj"
+	-@erase "$(INTDIR)\EqualityHelper.obj"
+	-@erase "$(INTDIR)\GroupDefinition.obj"
+	-@erase "$(INTDIR)\GroupEvent.obj"
+	-@erase "$(INTDIR)\HelperProvider.obj"
+	-@erase "$(INTDIR)\Logger.obj"
+	-@erase "$(INTDIR)\LogWriter.obj"
+	-@erase "$(INTDIR)\ParserErrorSetter.obj"
+	-@erase "$(INTDIR)\Property.obj"
+	-@erase "$(INTDIR)\PropertyDefinition.obj"
+	-@erase "$(INTDIR)\PropertyDefinitionImpl.obj"
+	-@erase "$(INTDIR)\PropertyImpl.obj"
+	-@erase "$(INTDIR)\PropertyList.obj"
+	-@erase "$(INTDIR)\PropertySetting.obj"
+	-@erase "$(INTDIR)\RefCountingObject.obj"
+	-@erase "$(INTDIR)\RefCountingPointer.obj"
+	-@erase "$(INTDIR)\SAX2Attribute.obj"
+	-@erase "$(INTDIR)\SAX2Attributes.obj"
+	-@erase "$(INTDIR)\SAX2Namespaces.obj"
+	-@erase "$(INTDIR)\SAX2Parser.obj"
+	-@erase "$(INTDIR)\SchemaInfo.obj"
+	-@erase "$(INTDIR)\SdoCheck.obj"
+	-@erase "$(INTDIR)\SDODate.obj"
+	-@erase "$(INTDIR)\SdoRuntime.obj"
+	-@erase "$(INTDIR)\SDORuntimeException.obj"
+	-@erase "$(INTDIR)\SDOSAX2Parser.obj"
+	-@erase "$(INTDIR)\SDOSchemaSAX2Parser.obj"
+	-@erase "$(INTDIR)\SDOString.obj"
+	-@erase "$(INTDIR)\SDOUtils.obj"
+	-@erase "$(INTDIR)\SDOXMLBufferWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLFileWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLStreamWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLString.obj"
+	-@erase "$(INTDIR)\SDOXMLWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDBufferWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDFileWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDStreamWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDWriter.obj"
+	-@erase "$(INTDIR)\Sequence.obj"
+	-@erase "$(INTDIR)\SequenceImpl.obj"
+	-@erase "$(INTDIR)\Setting.obj"
+	-@erase "$(INTDIR)\SettingList.obj"
+	-@erase "$(INTDIR)\Type.obj"
+	-@erase "$(INTDIR)\TypeDefinition.obj"
+	-@erase "$(INTDIR)\TypeDefinitionImpl.obj"
+	-@erase "$(INTDIR)\TypeDefinitions.obj"
+	-@erase "$(INTDIR)\TypeDefinitionsImpl.obj"
+	-@erase "$(INTDIR)\TypeImpl.obj"
+	-@erase "$(INTDIR)\TypeList.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\XMLDocument.obj"
+	-@erase "$(INTDIR)\XMLDocumentImpl.obj"
+	-@erase "$(INTDIR)\XMLHelper.obj"
+	-@erase "$(INTDIR)\XMLHelperImpl.obj"
+	-@erase "$(INTDIR)\XMLQName.obj"
+	-@erase "$(INTDIR)\XpathHelper.obj"
+	-@erase "$(INTDIR)\XSDHelper.obj"
+	-@erase "$(INTDIR)\XSDHelperImpl.obj"
+	-@erase "$(INTDIR)\XSDPropertyInfo.obj"
+	-@erase "$(INTDIR)\XSDTypeInfo.obj"
+	-@erase "$(OUTDIR)\tuscany_sdo.dll"
+	-@erase "$(OUTDIR)\tuscany_sdo.exp"
+	-@erase "$(OUTDIR)\tuscany_sdo.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_runtime.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libxml2.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\tuscany_sdo.pdb" /machine:I386 /out:"$(OUTDIR)\tuscany_sdo.dll" /implib:"$(OUTDIR)\tuscany_sdo.lib" /libpath:"$(LIBXML2_HOME)\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\ChangedDataObjectListImpl.obj" \
+	"$(INTDIR)\ChangeSummary.obj" \
+	"$(INTDIR)\ChangeSummaryBuilder.obj" \
+	"$(INTDIR)\ChangeSummaryImpl.obj" \
+	"$(INTDIR)\CopyHelper.obj" \
+	"$(INTDIR)\DASProperty.obj" \
+	"$(INTDIR)\DASType.obj" \
+	"$(INTDIR)\DASValue.obj" \
+	"$(INTDIR)\DASValues.obj" \
+	"$(INTDIR)\DataFactory.obj" \
+	"$(INTDIR)\DataFactoryImpl.obj" \
+	"$(INTDIR)\DataGraph.obj" \
+	"$(INTDIR)\DataGraphImpl.obj" \
+	"$(INTDIR)\DataObject.obj" \
+	"$(INTDIR)\DataObjectImpl.obj" \
+	"$(INTDIR)\DataObjectInstance.obj" \
+	"$(INTDIR)\DataObjectList.obj" \
+	"$(INTDIR)\DataObjectListImpl.obj" \
+	"$(INTDIR)\DefaultLogWriter.obj" \
+	"$(INTDIR)\EqualityHelper.obj" \
+	"$(INTDIR)\GroupDefinition.obj" \
+	"$(INTDIR)\GroupEvent.obj" \
+	"$(INTDIR)\HelperProvider.obj" \
+	"$(INTDIR)\Logger.obj" \
+	"$(INTDIR)\LogWriter.obj" \
+	"$(INTDIR)\ParserErrorSetter.obj" \
+	"$(INTDIR)\Property.obj" \
+	"$(INTDIR)\PropertyDefinition.obj" \
+	"$(INTDIR)\PropertyDefinitionImpl.obj" \
+	"$(INTDIR)\PropertyImpl.obj" \
+	"$(INTDIR)\PropertyList.obj" \
+	"$(INTDIR)\PropertySetting.obj" \
+	"$(INTDIR)\RefCountingObject.obj" \
+	"$(INTDIR)\RefCountingPointer.obj" \
+	"$(INTDIR)\SAX2Attribute.obj" \
+	"$(INTDIR)\SAX2Attributes.obj" \
+	"$(INTDIR)\SAX2Namespaces.obj" \
+	"$(INTDIR)\SAX2Parser.obj" \
+	"$(INTDIR)\SchemaInfo.obj" \
+	"$(INTDIR)\SdoCheck.obj" \
+	"$(INTDIR)\SDODate.obj" \
+	"$(INTDIR)\SdoRuntime.obj" \
+	"$(INTDIR)\SDORuntimeException.obj" \
+	"$(INTDIR)\SDOSAX2Parser.obj" \
+	"$(INTDIR)\SDOSchemaSAX2Parser.obj" \
+	"$(INTDIR)\SDOString.obj" \
+	"$(INTDIR)\SDOUtils.obj" \
+	"$(INTDIR)\SDOXMLBufferWriter.obj" \
+	"$(INTDIR)\SDOXMLFileWriter.obj" \
+	"$(INTDIR)\SDOXMLStreamWriter.obj" \
+	"$(INTDIR)\SDOXMLString.obj" \
+	"$(INTDIR)\SDOXMLWriter.obj" \
+	"$(INTDIR)\SDOXSDBufferWriter.obj" \
+	"$(INTDIR)\SDOXSDFileWriter.obj" \
+	"$(INTDIR)\SDOXSDStreamWriter.obj" \
+	"$(INTDIR)\SDOXSDWriter.obj" \
+	"$(INTDIR)\Sequence.obj" \
+	"$(INTDIR)\SequenceImpl.obj" \
+	"$(INTDIR)\Setting.obj" \
+	"$(INTDIR)\SettingList.obj" \
+	"$(INTDIR)\Type.obj" \
+	"$(INTDIR)\TypeDefinition.obj" \
+	"$(INTDIR)\TypeDefinitionImpl.obj" \
+	"$(INTDIR)\TypeDefinitions.obj" \
+	"$(INTDIR)\TypeDefinitionsImpl.obj" \
+	"$(INTDIR)\TypeImpl.obj" \
+	"$(INTDIR)\TypeList.obj" \
+	"$(INTDIR)\XMLDocument.obj" \
+	"$(INTDIR)\XMLDocumentImpl.obj" \
+	"$(INTDIR)\XMLHelper.obj" \
+	"$(INTDIR)\XMLHelperImpl.obj" \
+	"$(INTDIR)\XMLQName.obj" \
+	"$(INTDIR)\XpathHelper.obj" \
+	"$(INTDIR)\XSDHelper.obj" \
+	"$(INTDIR)\XSDHelperImpl.obj" \
+	"$(INTDIR)\XSDPropertyInfo.obj" \
+	"$(INTDIR)\XSDTypeInfo.obj"
+
+"$(OUTDIR)\tuscany_sdo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+PostBuild_Desc=copyout
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\tuscany_sdo.dll"
+   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
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "sdo_runtime - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\tuscany_sdo.dll"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\ChangedDataObjectListImpl.obj"
+	-@erase "$(INTDIR)\ChangeSummary.obj"
+	-@erase "$(INTDIR)\ChangeSummaryBuilder.obj"
+	-@erase "$(INTDIR)\ChangeSummaryImpl.obj"
+	-@erase "$(INTDIR)\CopyHelper.obj"
+	-@erase "$(INTDIR)\DASProperty.obj"
+	-@erase "$(INTDIR)\DASType.obj"
+	-@erase "$(INTDIR)\DASValue.obj"
+	-@erase "$(INTDIR)\DASValues.obj"
+	-@erase "$(INTDIR)\DataFactory.obj"
+	-@erase "$(INTDIR)\DataFactoryImpl.obj"
+	-@erase "$(INTDIR)\DataGraph.obj"
+	-@erase "$(INTDIR)\DataGraphImpl.obj"
+	-@erase "$(INTDIR)\DataObject.obj"
+	-@erase "$(INTDIR)\DataObjectImpl.obj"
+	-@erase "$(INTDIR)\DataObjectInstance.obj"
+	-@erase "$(INTDIR)\DataObjectList.obj"
+	-@erase "$(INTDIR)\DataObjectListImpl.obj"
+	-@erase "$(INTDIR)\DefaultLogWriter.obj"
+	-@erase "$(INTDIR)\EqualityHelper.obj"
+	-@erase "$(INTDIR)\GroupDefinition.obj"
+	-@erase "$(INTDIR)\GroupEvent.obj"
+	-@erase "$(INTDIR)\HelperProvider.obj"
+	-@erase "$(INTDIR)\Logger.obj"
+	-@erase "$(INTDIR)\LogWriter.obj"
+	-@erase "$(INTDIR)\ParserErrorSetter.obj"
+	-@erase "$(INTDIR)\Property.obj"
+	-@erase "$(INTDIR)\PropertyDefinition.obj"
+	-@erase "$(INTDIR)\PropertyDefinitionImpl.obj"
+	-@erase "$(INTDIR)\PropertyImpl.obj"
+	-@erase "$(INTDIR)\PropertyList.obj"
+	-@erase "$(INTDIR)\PropertySetting.obj"
+	-@erase "$(INTDIR)\RefCountingObject.obj"
+	-@erase "$(INTDIR)\RefCountingPointer.obj"
+	-@erase "$(INTDIR)\SAX2Attribute.obj"
+	-@erase "$(INTDIR)\SAX2Attributes.obj"
+	-@erase "$(INTDIR)\SAX2Namespaces.obj"
+	-@erase "$(INTDIR)\SAX2Parser.obj"
+	-@erase "$(INTDIR)\SchemaInfo.obj"
+	-@erase "$(INTDIR)\SdoCheck.obj"
+	-@erase "$(INTDIR)\SDODate.obj"
+	-@erase "$(INTDIR)\SdoRuntime.obj"
+	-@erase "$(INTDIR)\SDORuntimeException.obj"
+	-@erase "$(INTDIR)\SDOSAX2Parser.obj"
+	-@erase "$(INTDIR)\SDOSchemaSAX2Parser.obj"
+	-@erase "$(INTDIR)\SDOString.obj"
+	-@erase "$(INTDIR)\SDOUtils.obj"
+	-@erase "$(INTDIR)\SDOXMLBufferWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLFileWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLStreamWriter.obj"
+	-@erase "$(INTDIR)\SDOXMLString.obj"
+	-@erase "$(INTDIR)\SDOXMLWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDBufferWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDFileWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDStreamWriter.obj"
+	-@erase "$(INTDIR)\SDOXSDWriter.obj"
+	-@erase "$(INTDIR)\Sequence.obj"
+	-@erase "$(INTDIR)\SequenceImpl.obj"
+	-@erase "$(INTDIR)\Setting.obj"
+	-@erase "$(INTDIR)\SettingList.obj"
+	-@erase "$(INTDIR)\Type.obj"
+	-@erase "$(INTDIR)\TypeDefinition.obj"
+	-@erase "$(INTDIR)\TypeDefinitionImpl.obj"
+	-@erase "$(INTDIR)\TypeDefinitions.obj"
+	-@erase "$(INTDIR)\TypeDefinitionsImpl.obj"
+	-@erase "$(INTDIR)\TypeImpl.obj"
+	-@erase "$(INTDIR)\TypeList.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\XMLDocument.obj"
+	-@erase "$(INTDIR)\XMLDocumentImpl.obj"
+	-@erase "$(INTDIR)\XMLHelper.obj"
+	-@erase "$(INTDIR)\XMLHelperImpl.obj"
+	-@erase "$(INTDIR)\XMLQName.obj"
+	-@erase "$(INTDIR)\XpathHelper.obj"
+	-@erase "$(INTDIR)\XSDHelper.obj"
+	-@erase "$(INTDIR)\XSDHelperImpl.obj"
+	-@erase "$(INTDIR)\XSDPropertyInfo.obj"
+	-@erase "$(INTDIR)\XSDTypeInfo.obj"
+	-@erase "$(OUTDIR)\tuscany_sdo.dll"
+	-@erase "$(OUTDIR)\tuscany_sdo.exp"
+	-@erase "$(OUTDIR)\tuscany_sdo.ilk"
+	-@erase "$(OUTDIR)\tuscany_sdo.lib"
+	-@erase "$(OUTDIR)\tuscany_sdo.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_runtime.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libxml2.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\tuscany_sdo.pdb" /debug /machine:I386 /out:"$(OUTDIR)\tuscany_sdo.dll" /implib:"$(OUTDIR)\tuscany_sdo.lib" /pdbtype:sept /libpath:"$(LIBXML2_HOME)\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\ChangedDataObjectListImpl.obj" \
+	"$(INTDIR)\ChangeSummary.obj" \
+	"$(INTDIR)\ChangeSummaryBuilder.obj" \
+	"$(INTDIR)\ChangeSummaryImpl.obj" \
+	"$(INTDIR)\CopyHelper.obj" \
+	"$(INTDIR)\DASProperty.obj" \
+	"$(INTDIR)\DASType.obj" \
+	"$(INTDIR)\DASValue.obj" \
+	"$(INTDIR)\DASValues.obj" \
+	"$(INTDIR)\DataFactory.obj" \
+	"$(INTDIR)\DataFactoryImpl.obj" \
+	"$(INTDIR)\DataGraph.obj" \
+	"$(INTDIR)\DataGraphImpl.obj" \
+	"$(INTDIR)\DataObject.obj" \
+	"$(INTDIR)\DataObjectImpl.obj" \
+	"$(INTDIR)\DataObjectInstance.obj" \
+	"$(INTDIR)\DataObjectList.obj" \
+	"$(INTDIR)\DataObjectListImpl.obj" \
+	"$(INTDIR)\DefaultLogWriter.obj" \
+	"$(INTDIR)\EqualityHelper.obj" \
+	"$(INTDIR)\GroupDefinition.obj" \
+	"$(INTDIR)\GroupEvent.obj" \
+	"$(INTDIR)\HelperProvider.obj" \
+	"$(INTDIR)\Logger.obj" \
+	"$(INTDIR)\LogWriter.obj" \
+	"$(INTDIR)\ParserErrorSetter.obj" \
+	"$(INTDIR)\Property.obj" \
+	"$(INTDIR)\PropertyDefinition.obj" \
+	"$(INTDIR)\PropertyDefinitionImpl.obj" \
+	"$(INTDIR)\PropertyImpl.obj" \
+	"$(INTDIR)\PropertyList.obj" \
+	"$(INTDIR)\PropertySetting.obj" \
+	"$(INTDIR)\RefCountingObject.obj" \
+	"$(INTDIR)\RefCountingPointer.obj" \
+	"$(INTDIR)\SAX2Attribute.obj" \
+	"$(INTDIR)\SAX2Attributes.obj" \
+	"$(INTDIR)\SAX2Namespaces.obj" \
+	"$(INTDIR)\SAX2Parser.obj" \
+	"$(INTDIR)\SchemaInfo.obj" \
+	"$(INTDIR)\SdoCheck.obj" \
+	"$(INTDIR)\SDODate.obj" \
+	"$(INTDIR)\SdoRuntime.obj" \
+	"$(INTDIR)\SDORuntimeException.obj" \
+	"$(INTDIR)\SDOSAX2Parser.obj" \
+	"$(INTDIR)\SDOSchemaSAX2Parser.obj" \
+	"$(INTDIR)\SDOString.obj" \
+	"$(INTDIR)\SDOUtils.obj" \
+	"$(INTDIR)\SDOXMLBufferWriter.obj" \
+	"$(INTDIR)\SDOXMLFileWriter.obj" \
+	"$(INTDIR)\SDOXMLStreamWriter.obj" \
+	"$(INTDIR)\SDOXMLString.obj" \
+	"$(INTDIR)\SDOXMLWriter.obj" \
+	"$(INTDIR)\SDOXSDBufferWriter.obj" \
+	"$(INTDIR)\SDOXSDFileWriter.obj" \
+	"$(INTDIR)\SDOXSDStreamWriter.obj" \
+	"$(INTDIR)\SDOXSDWriter.obj" \
+	"$(INTDIR)\Sequence.obj" \
+	"$(INTDIR)\SequenceImpl.obj" \
+	"$(INTDIR)\Setting.obj" \
+	"$(INTDIR)\SettingList.obj" \
+	"$(INTDIR)\Type.obj" \
+	"$(INTDIR)\TypeDefinition.obj" \
+	"$(INTDIR)\TypeDefinitionImpl.obj" \
+	"$(INTDIR)\TypeDefinitions.obj" \
+	"$(INTDIR)\TypeDefinitionsImpl.obj" \
+	"$(INTDIR)\TypeImpl.obj" \
+	"$(INTDIR)\TypeList.obj" \
+	"$(INTDIR)\XMLDocument.obj" \
+	"$(INTDIR)\XMLDocumentImpl.obj" \
+	"$(INTDIR)\XMLHelper.obj" \
+	"$(INTDIR)\XMLHelperImpl.obj" \
+	"$(INTDIR)\XMLQName.obj" \
+	"$(INTDIR)\XpathHelper.obj" \
+	"$(INTDIR)\XSDHelper.obj" \
+	"$(INTDIR)\XSDHelperImpl.obj" \
+	"$(INTDIR)\XSDPropertyInfo.obj" \
+	"$(INTDIR)\XSDTypeInfo.obj"
+
+"$(OUTDIR)\tuscany_sdo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+PostBuild_Desc=copyout
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\tuscany_sdo.dll"
+   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
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("sdo_runtime.dep")
+!INCLUDE "sdo_runtime.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "sdo_runtime.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "sdo_runtime - Win32 Release" || "$(CFG)" == "sdo_runtime - Win32 Debug"
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectListImpl.cpp
+
+"$(INTDIR)\ChangedDataObjectListImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.cpp
+
+"$(INTDIR)\ChangeSummary.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryBuilder.cpp
+
+"$(INTDIR)\ChangeSummaryBuilder.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ChangeSummaryImpl.cpp
+
+"$(INTDIR)\ChangeSummaryImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\CopyHelper.cpp
+
+"$(INTDIR)\CopyHelper.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASProperty.cpp
+
+"$(INTDIR)\DASProperty.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASType.cpp
+
+"$(INTDIR)\DASType.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValue.cpp
+
+"$(INTDIR)\DASValue.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DASValues.cpp
+
+"$(INTDIR)\DASValues.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactory.cpp
+
+"$(INTDIR)\DataFactory.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataFactoryImpl.cpp
+
+"$(INTDIR)\DataFactoryImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraph.cpp
+
+"$(INTDIR)\DataGraph.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataGraphImpl.cpp
+
+"$(INTDIR)\DataGraphImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObject.cpp
+
+"$(INTDIR)\DataObject.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectImpl.cpp
+
+"$(INTDIR)\DataObjectImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.cpp
+
+"$(INTDIR)\DataObjectInstance.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectList.cpp
+
+"$(INTDIR)\DataObjectList.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DataObjectListImpl.cpp
+
+"$(INTDIR)\DataObjectListImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.cpp
+
+"$(INTDIR)\DefaultLogWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.cpp
+
+"$(INTDIR)\EqualityHelper.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupDefinition.cpp
+
+"$(INTDIR)\GroupDefinition.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\GroupEvent.cpp
+
+"$(INTDIR)\GroupEvent.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\HelperProvider.cpp
+
+"$(INTDIR)\HelperProvider.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Logger.cpp
+
+"$(INTDIR)\Logger.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\LogWriter.cpp
+
+"$(INTDIR)\LogWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\ParserErrorSetter.cpp
+
+"$(INTDIR)\ParserErrorSetter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Property.cpp
+
+"$(INTDIR)\Property.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.cpp
+
+"$(INTDIR)\PropertyDefinition.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyDefinitionImpl.cpp
+
+"$(INTDIR)\PropertyDefinitionImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyImpl.cpp
+
+"$(INTDIR)\PropertyImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertyList.cpp
+
+"$(INTDIR)\PropertyList.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\PropertySetting.cpp
+
+"$(INTDIR)\PropertySetting.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.cpp
+
+"$(INTDIR)\RefCountingObject.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.cpp
+
+"$(INTDIR)\RefCountingPointer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attribute.cpp
+
+"$(INTDIR)\SAX2Attribute.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Attributes.cpp
+
+"$(INTDIR)\SAX2Attributes.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Namespaces.cpp
+
+"$(INTDIR)\SAX2Namespaces.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SAX2Parser.cpp
+
+"$(INTDIR)\SAX2Parser.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SchemaInfo.cpp
+
+"$(INTDIR)\SchemaInfo.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoCheck.cpp
+
+"$(INTDIR)\SdoCheck.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDODate.cpp
+
+"$(INTDIR)\SDODate.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SdoRuntime.cpp
+
+"$(INTDIR)\SdoRuntime.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.cpp
+
+"$(INTDIR)\SDORuntimeException.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSAX2Parser.cpp
+
+"$(INTDIR)\SDOSAX2Parser.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOSchemaSAX2Parser.cpp
+
+"$(INTDIR)\SDOSchemaSAX2Parser.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOString.cpp
+
+"$(INTDIR)\SDOString.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOUtils.cpp
+
+"$(INTDIR)\SDOUtils.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLBufferWriter.cpp
+
+"$(INTDIR)\SDOXMLBufferWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLFileWriter.cpp
+
+"$(INTDIR)\SDOXMLFileWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLStreamWriter.cpp
+
+"$(INTDIR)\SDOXMLStreamWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLString.cpp
+
+"$(INTDIR)\SDOXMLString.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXMLWriter.cpp
+
+"$(INTDIR)\SDOXMLWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDBufferWriter.cpp
+
+"$(INTDIR)\SDOXSDBufferWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDFileWriter.cpp
+
+"$(INTDIR)\SDOXSDFileWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDStreamWriter.cpp
+
+"$(INTDIR)\SDOXSDStreamWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SDOXSDWriter.cpp
+
+"$(INTDIR)\SDOXSDWriter.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Sequence.cpp
+
+"$(INTDIR)\Sequence.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SequenceImpl.cpp
+
+"$(INTDIR)\SequenceImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Setting.cpp
+
+"$(INTDIR)\Setting.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\SettingList.cpp
+
+"$(INTDIR)\SettingList.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\Type.cpp
+
+"$(INTDIR)\Type.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.cpp
+
+"$(INTDIR)\TypeDefinition.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionImpl.cpp
+
+"$(INTDIR)\TypeDefinitionImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.cpp
+
+"$(INTDIR)\TypeDefinitions.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeDefinitionsImpl.cpp
+
+"$(INTDIR)\TypeDefinitionsImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeImpl.cpp
+
+"$(INTDIR)\TypeImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\TypeList.cpp
+
+"$(INTDIR)\TypeList.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocument.cpp
+
+"$(INTDIR)\XMLDocument.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLDocumentImpl.cpp
+
+"$(INTDIR)\XMLDocumentImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelper.cpp
+
+"$(INTDIR)\XMLHelper.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLHelperImpl.cpp
+
+"$(INTDIR)\XMLHelperImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XMLQName.cpp
+
+"$(INTDIR)\XMLQName.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XpathHelper.cpp
+
+"$(INTDIR)\XpathHelper.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelper.cpp
+
+"$(INTDIR)\XSDHelper.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDHelperImpl.cpp
+
+"$(INTDIR)\XSDHelperImpl.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDPropertyInfo.cpp
+
+"$(INTDIR)\XSDPropertyInfo.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\src\commonj\sdo\XSDTypeInfo.cpp
+
+"$(INTDIR)\XSDTypeInfo.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
new file mode 100644
index 0000000000..f4fc233e2b
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_runtime/tuscany_sdo.ilk
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
new file mode 100644
index 0000000000..68b514aa1b
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="sdo_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=sdo_test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_test.mak" CFG="sdo_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sdo_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sdo_test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sdo.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /verbose /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Release
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "sdo_test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /Zm200 /c
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Debug	copy ..\..\..\deploy\bin\*.pdb Debug
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sdo_test - Win32 Release"
+# Name "sdo_test - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\SdoGenerate.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\sdotest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\sdotest2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\utils.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\runtime\core\test\sdotest.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Source File
+
+SOURCE=..\build_instructions.txt
+# End Source File
+# End Target
+# End Project
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
new file mode 100644
index 0000000000..d4cc02d1f1
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
@@ -0,0 +1,303 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on sdo_test.dsp
+!IF "$(CFG)" == ""
+CFG=sdo_test - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to sdo_test - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "sdo_test - Win32 Release" && "$(CFG)" != "sdo_test - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "sdo_test.mak" CFG="sdo_test - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sdo_test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sdo_test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "sdo_test - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\sdo_test.exe"
+
+!ELSE 
+
+ALL : "sdo_runtime - Win32 Release" "$(OUTDIR)\sdo_test.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_runtime - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\SdoGenerate.obj"
+	-@erase "$(INTDIR)\sdotest.obj"
+	-@erase "$(INTDIR)\sdotest2.obj"
+	-@erase "$(INTDIR)\utils.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(OUTDIR)\sdo_test.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_test.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sdo.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_test.exe" /libpath:"..\..\..\deploy\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\SdoGenerate.obj" \
+	"$(INTDIR)\sdotest.obj" \
+	"$(INTDIR)\sdotest2.obj" \
+	"$(INTDIR)\utils.obj" \
+	"..\sdo_runtime\Release\tuscany_sdo.lib"
+
+"$(OUTDIR)\sdo_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Release" "$(OUTDIR)\sdo_test.exe"
+   copy ..\..\..\deploy\bin\*.dll Release
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF  "$(CFG)" == "sdo_test - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\sdo_test.exe"
+
+!ELSE 
+
+ALL : "sdo_runtime - Win32 Debug" "$(OUTDIR)\sdo_test.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"sdo_runtime - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\main.obj"
+	-@erase "$(INTDIR)\SdoGenerate.obj"
+	-@erase "$(INTDIR)\sdotest.obj"
+	-@erase "$(INTDIR)\sdotest2.obj"
+	-@erase "$(INTDIR)\utils.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\sdo_test.exe"
+	-@erase "$(OUTDIR)\sdo_test.ilk"
+	-@erase "$(OUTDIR)\sdo_test.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /Zm200 /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdo_test.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=tuscany_sdo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\sdo_test.pdb" /debug /machine:I386 /out:"$(OUTDIR)\sdo_test.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib" 
+LINK32_OBJS= \
+	"$(INTDIR)\main.obj" \
+	"$(INTDIR)\SdoGenerate.obj" \
+	"$(INTDIR)\sdotest.obj" \
+	"$(INTDIR)\sdotest2.obj" \
+	"$(INTDIR)\utils.obj" \
+	"..\sdo_runtime\Debug\tuscany_sdo.lib"
+
+"$(OUTDIR)\sdo_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Debug" "$(OUTDIR)\sdo_test.exe"
+   copy ..\..\..\deploy\bin\*.dll Debug
+	copy ..\..\..\deploy\bin\*.pdb Debug
+	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("sdo_test.dep")
+!INCLUDE "sdo_test.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "sdo_test.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "sdo_test - Win32 Release" || "$(CFG)" == "sdo_test - Win32 Debug"
+SOURCE=..\..\..\runtime\core\test\main.cpp
+
+"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\test\SdoGenerate.cpp
+
+"$(INTDIR)\SdoGenerate.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\test\sdotest.cpp
+
+"$(INTDIR)\sdotest.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\test\sdotest2.cpp
+
+"$(INTDIR)\sdotest2.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\runtime\core\test\utils.cpp
+
+"$(INTDIR)\utils.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "sdo_test - Win32 Release"
+
+"sdo_runtime - Win32 Release" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" 
+   cd "..\sdo_test"
+
+"sdo_runtime - Win32 ReleaseCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\sdo_test"
+
+!ELSEIF  "$(CFG)" == "sdo_test - Win32 Debug"
+
+"sdo_runtime - Win32 Debug" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" 
+   cd "..\sdo_test"
+
+"sdo_runtime - Win32 DebugCLEAN" : 
+   cd "..\sdo_runtime"
+   $(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\sdo_test"
+
+!ENDIF 
+
+
+!ENDIF 
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
new file mode 100644
index 0000000000..7447226eb9
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.dsw
@@ -0,0 +1,80 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "sdo_axiom"=.\sdo_axiom\sdo_axiom.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name sdo_runtime
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "sdo_axiom_test"=.\sdo_axiom_test\sdo_axiom_test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name sdo_axiom
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name sdo_runtime
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name sdo_test
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "sdo_runtime"=.\sdo_runtime\sdo_runtime.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "sdo_test"=.\sdo_test\sdo_test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name sdo_runtime
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
new file mode 100644
index 0000000000..6a595ae6aa
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
diff --git a/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt
new file mode 100644
index 0000000000..90fd624b1d
--- /dev/null
+++ b/branches/cpp-M1/sdo/projects/tuscany_sdo/tuscany_sdo.opt
author	dims <dims@13f79535-47bb-0310-9956-ffa450edef68>	2008-06-17 00:23:01 +0000
committer	dims <dims@13f79535-47bb-0310-9956-ffa450edef68>	2008-06-17 00:23:01 +0000
commit	bdd0a41aed7edf21ec2a65cfa17a86af2ef8c48a (patch)
tree	38a92061c0793434c4be189f1d70c3458b6bc41d /branches/cpp-M1/sdo/projects