[Mobies-commit] [commit] r3625 - in UDM/trunk: Projects/Win32/VC9/samples/CreateLampModel Projects/Win32/VC9/samples/cross_links Projects/Win32/VC9/src Projects/Win32/VC9/src/MPCGen Projects/Win32/VC9/src/StrResGen Projects/Win32/VC9/src/UML GME/ExprChecker Projects/Win32/VC9/src/UML GME/Interpreter Projects/Win32/VC9/src/Udm Projects/Win32/VC9/src/Udm/File2Code Projects/Win32/VC9/src/Udm/JavaAPIGen Projects/Win32/VC9/src/UdmBackendDump Projects/Win32/VC9/src/UdmBase Projects/Win32/VC9/src/UdmCopy Projects/Win32/VC9/src/UdmDll Projects/Win32/VC9/src/UdmDom Projects/Win32/VC9/src/UdmGme Projects/Win32/VC9/src/UdmOcl Projects/Win32/VC9/src/UdmOclPat Projects/Win32/VC9/src/UdmOclPat/GOCL/src Projects/Win32/VC9/src/UdmPOI Projects/Win32/VC9/src/UdmSwig Projects/Win32/VC9/src/UdmToXmi Projects/Win32/VC9/src/UdmUtil Projects/Win32/VC9/src/UdmViz Projects/Win32/VC9/src/UdmXmi Projects/Win32/VC9/src/Uml Projects/Win32/VC9/src/XmiToUdm Projects/Win32/VC9/tests Projects/Win32/VC9/tests/testG! etAdjacentObjects Projects/Win32/VC9/tests/testOCL Projects/Win32/VC9/tests/testUdmCint Projects/Win32/VC9/tests/test_assocInheritanceMGA Projects/Win32/VC9/tests/test_childrenorder Projects/Win32/VC9/tests/test_cintstring Projects/Win32/VC9/tests/test_crosslinks Projects/Win32/VC9/tests/test_domstringdn Projects/Win32/VC9/tests/test_generic Projects/Win32/VC9/tests/test_generic2 Projects/Win32/VC9/tests/test_libs Projects/Win32/VC9/tests/test_ns Projects/Win32/VC9/tests/test_ns2 Projects/Win32/VC9/tests/test_refports Projects/Win32/VC9/tests/test_simpleudmops scripts

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Fri Jan 28 16:53:58 CST 2011


Author: ksmyth
Date: Fri Jan 28 16:53:58 2011
New Revision: 3625

Log:
Use .vsprops for INCLUDE, swig.exe, LIB, antlr CLASSPATH

Added:
   UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops   (contents, props changed)
Modified:
   UDM/trunk/Projects/Win32/VC9/samples/CreateLampModel/CreateLampModel.vcproj
   UDM/trunk/Projects/Win32/VC9/samples/cross_links/cross_links.vcproj
   UDM/trunk/Projects/Win32/VC9/src/MPCGen/MPCGen.vcproj
   UDM/trunk/Projects/Win32/VC9/src/StrResGen/StrResGen.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UML GME/ExprChecker/GmeOclExprChecker.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UML GME/Interpreter/BONComponent.vcproj
   UDM/trunk/Projects/Win32/VC9/src/Udm/File2Code/File2Code.vcproj
   UDM/trunk/Projects/Win32/VC9/src/Udm/JavaAPIGen/JavaAPIGen.vcproj
   UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmBackendDump/UdmBackendDump.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmBase/UdmBase.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmCopy/UdmCopy.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmDom/UdmDom.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmGme/UdmGme.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmOcl/UdmOcl.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/UDMOclPat.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmPOI/UdmPOI.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmToXmi/UdmToXmi.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmUtil/UdmUtil.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmViz/UdmViz.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmXmi/UdmXmi.vcproj
   UDM/trunk/Projects/Win32/VC9/src/Uml/Uml.vcproj
   UDM/trunk/Projects/Win32/VC9/src/XmiToUdm/XmiToUdm.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln
   UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops
   UDM/trunk/Projects/Win32/VC9/tests/UdmTestsAll.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/testOCL/testOCL.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_assocInheritanceMGA/TestSignalFlow.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_cintstring/test_cintstring.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_domstringdn/test_domstringdn.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_generic/test_generic.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_libs/test_libs.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_ns2/test_ns2.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_refports/test_refports.vcproj
   UDM/trunk/Projects/Win32/VC9/tests/test_simpleudmops/LampTest.vcproj
   UDM/trunk/scripts/vc9-env.bat

Modified: UDM/trunk/Projects/Win32/VC9/samples/CreateLampModel/CreateLampModel.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/samples/CreateLampModel/CreateLampModel.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/samples/CreateLampModel/CreateLampModel.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\samples-paths.vsprops"
+			InheritedPropertySheets="..\samples-paths.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -45,8 +45,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="UmlD.lib UdmBaseD.lib UdmDomD.lib UdmGmeD.lib UdmUtilD.lib Xerces-c_2D.lib zlibD.lib"
 				OutputFile="$(OutDir)\CreateLampModelD.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -113,7 +112,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\samples-paths.vsprops"
+			InheritedPropertySheets="..\samples-paths.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -141,8 +140,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -169,7 +168,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Uml.lib Xerces-c_2.lib UdmBase.lib UdmDom.lib UdmGme.lib UdmUtil.lib zlib.lib"
 				OutputFile="$(OutDir)\CreateLampModel.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

Modified: UDM/trunk/Projects/Win32/VC9/samples/cross_links/cross_links.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/samples/cross_links/cross_links.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/samples/cross_links/cross_links.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\samples-paths.vsprops"
+			InheritedPropertySheets="..\samples-paths.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -47,7 +47,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/cross_links.pch"
@@ -72,7 +72,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="UmlD.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib xerces-c_2D.lib zlibD.lib"
 				OutputFile="$(OutDir)\cross_linksD.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -110,7 +109,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\samples-paths.vsprops"
+			InheritedPropertySheets="..\samples-paths.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -140,7 +139,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -165,7 +164,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Uml.lib UdmBase.lib UdmDom.lib UdmUtil.lib xerces-c_2.lib zlib.lib"
 				OutputFile="$(OutDir)\cross_links.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

Modified: UDM/trunk/Projects/Win32/VC9/src/MPCGen/MPCGen.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/MPCGen/MPCGen.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/MPCGen/MPCGen.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -99,6 +100,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

Modified: UDM/trunk/Projects/Win32/VC9/src/StrResGen/StrResGen.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/StrResGen/StrResGen.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/StrResGen/StrResGen.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -111,6 +112,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UML GME/ExprChecker/GmeOclExprChecker.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UML GME/ExprChecker/GmeOclExprChecker.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UML GME/ExprChecker/GmeOclExprChecker.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\UML GME\ExprChecker"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -120,6 +121,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\UML GME\ExprChecker"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -450,11 +452,11 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\..\..\..\..\..\src\UML GME\ExprChecker\CompIcon.ico"
+				RelativePath="..\..\..\..\..\..\src\UML GME\ExprChecker\compicon.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\..\src\UML GME\ExprChecker\compicon.ico"
+				RelativePath="..\..\..\..\..\..\src\UML GME\ExprChecker\CompIcon.ico"
 				>
 			</File>
 			<File

Modified: UDM/trunk/Projects/Win32/VC9/src/UML GME/Interpreter/BONComponent.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UML GME/Interpreter/BONComponent.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UML GME/Interpreter/BONComponent.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\UML GME\Interpreter"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -122,6 +123,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\UML GME\Interpreter"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			UseOfMFC="2"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"

Added: UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops	Fri Jan 28 16:53:58 2011	(r3625)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Udm"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include&quot;;&quot;$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\include&quot;;&quot;$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib\cpp&quot;;&quot;$(UDM_3RDPARTY_PATH)\zlib&quot;;&quot;$(UDM_3RDPARTY_PATH)\zlib\contrib\minizip&quot;;&quot;$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include&quot;;&quot;$(UDM_3RDPARTY_PATH)\boost_1_36_0&quot;;&quot;$(JDK_PATH)\include\win32&quot;;&quot;$(JDK_PATH)\include&quot;;&quot;$(GME_ROOT)\Interfaces&quot;;&quot;$(GME_ROOT)\Gme\Interfaces&quot;"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="&quot;$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\zlib&quot;;&quot;$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib&quot;;&quot;$(JDK_PATH)\lib&quot;"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+		AdditionalIncludeDirectories="&quot;$(GME_ROOT)\Interfaces&quot;;&quot;$(GME_ROOT)\Gme\Interfaces&quot;"
+	/>
+	<UserMacro
+		Name="CLASSPATH"
+		Value="$(UDM_3RDPARTY_PATH)\junit\junit.jar;$(UDM_3RDPARTY_PATH)\antlr-2.7.7\antlr.jar"
+		PerformEnvironmentSet="true"
+	/>
+	<UserMacro
+		Name="SWIG_EXE"
+		Value="$(UDM_3RDPARTY_PATH)\swigwin-2.0.0\swig.exe"
+	/>
+</VisualStudioPropertySheet>

Modified: UDM/trunk/Projects/Win32/VC9/src/Udm/File2Code/File2Code.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm/File2Code/File2Code.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm/File2Code/File2Code.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\Udm\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -86,6 +87,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\Udm\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

Modified: UDM/trunk/Projects/Win32/VC9/src/Udm/JavaAPIGen/JavaAPIGen.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm/JavaAPIGen/JavaAPIGen.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm/JavaAPIGen/JavaAPIGen.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\Udm\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -87,6 +88,7 @@
 			OutputDirectory="..\..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\Udm\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\Udm.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

Modified: UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -116,6 +117,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmBackendDump/UdmBackendDump.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmBackendDump/UdmBackendDump.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmBackendDump/UdmBackendDump.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -110,6 +111,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmBase/UdmBase.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmBase/UdmBase.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmBase/UdmBase.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -97,6 +98,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -173,6 +175,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\BootUdmCompileDebug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -227,6 +230,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\BootUdmCompileRelease"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmCopy/UdmCopy.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmCopy/UdmCopy.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmCopy/UdmCopy.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -114,6 +115,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -126,6 +127,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDom/UdmDom.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDom/UdmDom.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDom/UdmDom.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -96,6 +97,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmGme/UdmGme.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmGme/UdmGme.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmGme/UdmGme.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -98,6 +99,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmOcl/UdmOcl.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmOcl/UdmOcl.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmOcl/UdmOcl.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -94,6 +95,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\UdmOclPat\GOCL\src"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -94,6 +95,7 @@
 			OutputDirectory="..\..\..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\UdmOclPat\GOCL\src"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\..\..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/UDMOclPat.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/UDMOclPat.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/UDMOclPat.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -114,6 +115,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmPOI/UdmPOI.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmPOI/UdmPOI.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmPOI/UdmPOI.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>
@@ -88,6 +89,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -116,6 +117,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -225,7 +227,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="mkdir &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;cd  &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;swig.exe -java -package edu.vanderbilt.isis.udm.swig -outdir ..\..\..\..\..\..\judm\src\UdmSwig\edu\vanderbilt\isis\udm\swig -v -c++ -o $(InputName)_wrap.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="mkdir &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;cd  &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;&quot;$(SWIG_EXE)&quot; -java -package edu.vanderbilt.isis.udm.swig -outdir ..\..\..\..\..\..\judm\src\UdmSwig\edu\vanderbilt\isis\udm\swig -v -c++ -o $(InputName)_wrap.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					Outputs="$(OutDir)\..\Gen\src\UdmSwig\$(InputName)_wrap.cpp"
 				/>
 			</FileConfiguration>
@@ -234,7 +236,7 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="mkdir &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;cd  &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;swig.exe -java -package edu.vanderbilt.isis.udm.swig -outdir ..\..\..\..\..\..\judm\src\UdmSwig\edu\vanderbilt\isis\udm\swig -v -c++ -o $(InputName)_wrap.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="mkdir &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;cd  &quot;$(OutDir)\..\Gen\src\UdmSwig&quot;&#x0D;&#x0A;&quot;$(SWIG_EXE)&quot; -java -package edu.vanderbilt.isis.udm.swig -outdir ..\..\..\..\..\..\judm\src\UdmSwig\edu\vanderbilt\isis\udm\swig -v -c++ -o $(InputName)_wrap.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 					Outputs="$(OutDir)\..\Gen\src\UdmSwig\$(InputName)_wrap.cpp"
 				/>
 			</FileConfiguration>

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmToXmi/UdmToXmi.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmToXmi/UdmToXmi.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmToXmi/UdmToXmi.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -115,6 +116,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmUtil/UdmUtil.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmUtil/UdmUtil.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmUtil/UdmUtil.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -95,6 +96,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmViz/UdmViz.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmViz/UdmViz.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmViz/UdmViz.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -111,6 +112,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmXmi/UdmXmi.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmXmi/UdmXmi.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmXmi/UdmXmi.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -95,6 +96,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/src/Uml/Uml.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Uml/Uml.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/Uml/Uml.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>
@@ -88,6 +89,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>
@@ -152,7 +154,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\BootUdmCompileRelease"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
-
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>
@@ -217,7 +219,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\BootUdmCompileDebug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="4"
-
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>

Modified: UDM/trunk/Projects/Win32/VC9/src/XmiToUdm/XmiToUdm.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/XmiToUdm/XmiToUdm.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/src/XmiToUdm/XmiToUdm.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -113,6 +114,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\src\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\Udm.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln	Fri Jan 28 16:53:58 2011	(r3625)
@@ -82,6 +82,8 @@
 		{4F3BF916-A9BC-44BA-B867-BA14BE2EE074} = {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A2F36369-A019-4B5E-AD5B-3A5AA425069C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -170,4 +172,8 @@
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{7B2D07A4-E108-45B1-860B-43084AAB9192} = {A2F36369-A019-4B5E-AD5B-3A5AA425069C}
+		{4CA139A6-D338-4C6D-B9AD-86B65B8E5129} = {A2F36369-A019-4B5E-AD5B-3A5AA425069C}
+	EndGlobalSection
 EndGlobal

Modified: UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops	Fri Jan 28 16:53:58 2011	(r3625)
@@ -8,13 +8,13 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..\..\..\include;&quot;$(OutDir)\Gen\tests\$(ProjectName)&quot;"
+		AdditionalIncludeDirectories="..\..\..\..\..\include;&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include&quot;;&quot;$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include&quot;;&quot;$(UDM_3RDPARTY_PATH)\boost_1_36_0&quot;;&quot;$(OutDir)\Gen\tests\$(ProjectName)&quot;"
 		DebugInformationFormat="3"
 	/>
 	<Tool
 		Name="VCLinkerTool"
 		LinkIncremental="1"
-		AdditionalLibraryDirectories="$(OutDir)"
+		AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib&quot;;&quot;$(UDM_3RDPARTY_PATH)\boost_1_36_0&quot;;&quot;$(UDM_3RDPARTY_PATH)\zlib&quot;"
 		GenerateDebugInformation="true"
 		SubSystem="1"
 	/>

Modified: UDM/trunk/Projects/Win32/VC9/tests/UdmTestsAll.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/UdmTestsAll.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/UdmTestsAll.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,6 @@
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -45,7 +44,6 @@
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
@@ -69,4 +67,6 @@
 	</References>
 	<Files>
 	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>

Modified: UDM/trunk/Projects/Win32/VC9/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -108,7 +108,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -201,10 +201,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageA.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageA.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -213,10 +213,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageA.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageA.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -225,10 +225,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageB.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageB.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -237,10 +237,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageB.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageB.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -249,10 +249,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -261,10 +261,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -283,10 +283,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageA.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageA.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -295,10 +295,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageA.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageA.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -307,10 +307,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageB.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageB.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -319,10 +319,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\PackageB.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\PackageB.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -331,10 +331,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -343,10 +343,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -389,46 +389,46 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Generating UDM API files..."
+						CommandLine="&quot;$(OutDir)\udmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testGetAdjacentObjects&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Generating UDM API files..."
-						CommandLine="&quot;$(OutDir)\udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testGetAdjacentObjects&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Generating UDM API files..."
-						CommandLine="&quot;$(OutDir)\udmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testGetAdjacentObjects&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Generating UDM API files..."
+						CommandLine="&quot;$(OutDir)\udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testGetAdjacentObjects&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageA.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\PackageB.xsd; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h; $(OutDir)\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd"
 					/>
 				</FileConfiguration>
 			</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/testOCL/testOCL.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/testOCL/testOCL.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/testOCL/testOCL.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -108,7 +108,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -201,10 +201,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -213,10 +213,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -235,10 +235,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -247,10 +247,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -270,45 +270,45 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testOCL&quot; &quot;$(InputPath)&quot; -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testOCL\SBML2.cpp; $(OutDir)\Gen\tests\testOCL\SBML2.h; $(OutDir)\Gen\tests\testOCL\SBML2.dtd; $(OutDir)\Gen\tests\testOCL\SBML2.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_math.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_math.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_math_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Udm.exe $(InputName)"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testOCL&quot; &quot;$(InputPath)&quot; -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testOCL\SBML2.cpp; $(OutDir)\Gen\tests\testOCL\SBML2.h; $(OutDir)\Gen\tests\testOCL\SBML2.dtd; $(OutDir)\Gen\tests\testOCL\SBML2.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_math.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_math.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_math_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testOCL\SBML2_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testOCL\SBML2_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testOCL&quot; &quot;$(InputPath)&quot; -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testOCL\SBML2.cpp; $(OutDir)\Gen\tests\testOCL\SBML2.h; $(OutDir)\Gen\tests\testOCL\SBML2.dtd; $(OutDir)\Gen\tests\testOCL\SBML2.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_math.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_math.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_math_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Udm.exe $(InputName)"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testOCL&quot; &quot;$(InputPath)&quot; -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testOCL\SBML2.cpp; $(OutDir)\Gen\tests\testOCL\SBML2.h; $(OutDir)\Gen\tests\testOCL\SBML2.dtd; $(OutDir)\Gen\tests\testOCL\SBML2.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_math.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_math.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_math_xsd.h; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.dtd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml.xsd; $(OutDir)\Gen\tests\testOCL\SBML2_sbml_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -118,7 +118,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -260,45 +260,45 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testUdmCint\GeneTF_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testUdmCint\GeneTF_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -t -v -uGeneTF=http://kutykuruty.khm.edu&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; GeneTF.xsd GeneTF_xsd&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testUdmCint\GeneTF.cpp; $(OutDir)\Gen\tests\testUdmCint\GeneTF.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_xsd.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Udm $(InputName)"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -t -v -uGeneTF=http://kutykuruty.khm.edu&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; GeneTF.xsd GeneTF_xsd&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testUdmCint\GeneTF.cpp; $(OutDir)\Gen\tests\testUdmCint\GeneTF.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_xsd.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testUdmCint\GeneTF_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testUdmCint\GeneTF_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -t -v -uGeneTF=http://kutykuruty.khm.edu&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; GeneTF.xsd GeneTF_xsd&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testUdmCint\GeneTF.cpp; $(OutDir)\Gen\tests\testUdmCint\GeneTF.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_xsd.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Udm $(InputName)"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -t -v -uGeneTF=http://kutykuruty.khm.edu&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; GeneTF.xsd GeneTF_xsd&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testUdmCint\GeneTF.cpp; $(OutDir)\Gen\tests\testUdmCint\GeneTF.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.xsd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF.dtd; $(OutDir)\Gen\tests\testUdmCint\GeneTF_xsd.h; $(OutDir)\Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>
@@ -327,45 +327,45 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testUdmCint\SBML2Ex_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testUdmCint\SBML2Ex_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_math.xsd SBML2Ex_math_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd&#!
 x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_flux.xsd SBML2Ex_flux_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_jd.xsd SBML2Ex_jd_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_bc.xsd SBML2Ex_bc_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex.xsd SBML2Ex_xsd&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testUdmCint\SBML2Ex.cpp; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_bc.xsd; $(OutDir)\Gen\!
 tests\testUdmCint\SBML2Ex_bc_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Udm.exe $(InputFileName)"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_math.xsd SBML2Ex_math_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd&#x0D;&#!
 x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_flux.xsd SBML2Ex_flux_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_jd.xsd SBML2Ex_jd_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_bc.xsd SBML2Ex_bc_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex.xsd SBML2Ex_xsd&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testUdmCint\SBML2Ex.cpp; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_bc.xsd; $(OutDir)\Gen\!
 tests\testUdmCint\SBML2Ex_bc_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\testUdmCint\SBML2Ex_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\testUdmCint\SBML2Ex_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_math.xsd SBML2Ex_math_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd&#!
 x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_flux.xsd SBML2Ex_flux_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_jd.xsd SBML2Ex_jd_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex_bc.xsd SBML2Ex_bc_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGenD.exe&quot; SBML2Ex.xsd SBML2Ex_xsd&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\testUdmCint\SBML2Ex.cpp; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_bc.xsd; $(OutDir)\Gen\!
 tests\testUdmCint\SBML2Ex_bc_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xsd.h"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Udm.exe $(InputFileName)"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\testUdmCint&quot; &quot;$(InputPath)&quot; -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns&#x0D;&#x0A;cd &quot;$(OutDir)\Gen\tests\testUdmCint&quot;&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_math.xsd SBML2Ex_math_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd&#x0D;&#!
 x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_flux.xsd SBML2Ex_flux_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_jd.xsd SBML2Ex_jd_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex_bc.xsd SBML2Ex_bc_xsd&#x0D;&#x0A;&quot;..\..\$(OutDir)\StrResGen.exe&quot; SBML2Ex.xsd SBML2Ex_xsd&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\testUdmCint\SBML2Ex.cpp; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_math_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_bc.xsd; $(OutDir)\Gen\!
 tests\testUdmCint\SBML2Ex_bc_xsd.h; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex.xsd; $(OutDir)\Gen\tests\testUdmCint\SBML2Ex_xsd.h"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_assocInheritanceMGA/TestSignalFlow.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_assocInheritanceMGA/TestSignalFlow.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_assocInheritanceMGA/TestSignalFlow.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -117,7 +117,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -264,45 +264,45 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -316,10 +316,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -328,10 +328,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -392,46 +392,46 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="SignaFlow_udm.xml -&gt; C++ API"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_assocInheritanceMGA&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.h; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="SignaFlow_udm.xml -&gt; C++ API"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_assocInheritanceMGA&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.h; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="SignaFlow_udm.xml -&gt; C++ API"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_assocInheritanceMGA&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.h; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="SignaFlow_udm.xml -&gt; C++ API"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_assocInheritanceMGA&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.h; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp; $(OutDir)\Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -117,7 +117,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -244,45 +244,45 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -319,10 +319,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -331,10 +331,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_cintstring/test_cintstring.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_cintstring/test_cintstring.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_cintstring/test_cintstring.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -116,7 +116,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -118,7 +118,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -278,53 +278,53 @@
 			Name="Generated Files"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -333,10 +333,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -345,89 +345,89 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL_udm.udm"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL_udm.udm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Generating UDM API files from $(InputPath)"
-						CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_crosslinks&quot; &quot;$(InputPath)&quot; -d &quot;%UDM_PATH%\etc&quot;&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd; $(OutDir)\Gen\tests\test_crosslinks\CL.cpp; $(OutDir)\Gen\tests\test_crosslinks\CL.h; $(OutDir)\Gen\tests\test_crosslinks\CL.xsd; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.cpp; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.h; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp_NSc.xsd"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Generating UDM API files from $(InputPath)"
+						CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_crosslinks&quot; &quot;$(InputPath)&quot; -d &quot;%UDM_PATH%\etc&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL_udm.udm"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL_udm.udm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="Generating UDM API files from $(InputPath)"
+						CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_crosslinks&quot; &quot;$(InputPath)&quot; -d &quot;%UDM_PATH%\etc&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd; $(OutDir)\Gen\tests\test_crosslinks\CL.cpp; $(OutDir)\Gen\tests\test_crosslinks\CL.h; $(OutDir)\Gen\tests\test_crosslinks\CL.xsd; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.cpp; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.h; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp_NSc.xsd"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Generating UDM API files from $(InputPath)"
-						CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_crosslinks&quot; &quot;$(InputPath)&quot; -d &quot;%UDM_PATH%\etc&quot;&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CLPackage.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CLPackage.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CLPackage.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CLPackage.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -456,53 +456,53 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -511,10 +511,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -523,53 +523,53 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package2.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package2.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package2.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -578,10 +578,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package2.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_domstringdn/test_domstringdn.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_domstringdn/test_domstringdn.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_domstringdn/test_domstringdn.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -115,7 +115,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -238,45 +238,45 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -313,10 +313,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -325,10 +325,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_generic/test_generic.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_generic/test_generic.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_generic/test_generic.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -116,7 +116,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -244,45 +244,45 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -319,10 +319,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -331,10 +331,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -116,7 +116,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -244,45 +244,45 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -319,10 +319,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -331,10 +331,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -352,46 +352,46 @@
 			Filter="xml"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram_udm.xml"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram_udm.xml"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="LampDiagram_udm.xml -&gt; C++ API"
-						CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_generic2&quot; &quot;$(InputPath)&quot; -v --leesa&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="LampDiagram_udm.xml -&gt; C++ API"
+						CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_generic2&quot; &quot;$(InputPath)&quot; -v --leesa&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram_udm.xml"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram_udm.xml"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
+						Description="LampDiagram_udm.xml -&gt; C++ API"
+						CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_generic2&quot; &quot;$(InputPath)&quot; -v --leesa&#x0D;&#x0A;"
+						Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="LampDiagram_udm.xml -&gt; C++ API"
-						CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_generic2&quot; &quot;$(InputPath)&quot; -v --leesa&#x0D;&#x0A;"
-						Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
 					/>
 				</FileConfiguration>
 			</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_libs/test_libs.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_libs/test_libs.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_libs/test_libs.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,6 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -100,6 +101,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -184,10 +186,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -196,10 +198,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -222,10 +224,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -234,10 +236,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_ns/test_ns.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -108,7 +108,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -201,10 +201,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -213,10 +213,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -231,10 +231,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -243,10 +243,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -262,45 +262,45 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp; $(OutDir)\Gen\tests\test_ns\test_ns.h; $(OutDir)\Gen\tests\test_ns\test_ns.dtd; $(OutDir)\Gen\tests\test_ns\test_ns.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_A.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_A.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_B.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_B.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd Udm.exe $(InputFileName)"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns\test_ns_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns\test_ns_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp; $(OutDir)\Gen\tests\test_ns\test_ns.h; $(OutDir)\Gen\tests\test_ns\test_ns.dtd; $(OutDir)\Gen\tests\test_ns\test_ns.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_A.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_A.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_B.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_B.xsd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd; $(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd Udm.exe $(InputFileName)"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_ns\test_ns.cpp;$(OutDir)\Gen\tests\test_ns\test_ns.h;$(OutDir)\Gen\tests\test_ns\test_ns.dtd;$(OutDir)\Gen\tests\test_ns\test_ns.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)\Gen\tests\test_ns\test_ns_AB.xsd"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_ns2/test_ns2.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_ns2/test_ns2.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_ns2/test_ns2.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -108,7 +108,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -197,10 +197,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -209,10 +209,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -231,10 +231,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -243,10 +243,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -286,45 +286,45 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns2&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_ns2\CHost.cpp; $(OutDir)\Gen\tests\test_ns2\CHost.h; $(OutDir)\Gen\tests\test_ns2\CHost.dtd; $(OutDir)\Gen\tests\test_ns2\CHost.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_A.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_A.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_B.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_B.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_C.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_C.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Udm.exe $(InputFileName) "
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns2&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_ns2\CHost.cpp;$(OutDir)\Gen\tests\test_ns2\CHost.h;$(OutDir)\Gen\tests\test_ns2\CHost.dtd;$(OutDir)\Gen\tests\test_ns2\CHost.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_C.xsd"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_ns2\CHost_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_ns2\CHost_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns2&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_ns2\CHost.cpp; $(OutDir)\Gen\tests\test_ns2\CHost.h; $(OutDir)\Gen\tests\test_ns2\CHost.dtd; $(OutDir)\Gen\tests\test_ns2\CHost.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_A.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_A.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_B.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_B.xsd; $(OutDir)\Gen\tests\test_ns2\CHost_C.dtd; $(OutDir)\Gen\tests\test_ns2\CHost_C.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Udm.exe $(InputFileName) "
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_ns2&quot; &quot;$(InputPath)&quot; -t -v&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_ns2\CHost.cpp;$(OutDir)\Gen\tests\test_ns2\CHost.h;$(OutDir)\Gen\tests\test_ns2\CHost.dtd;$(OutDir)\Gen\tests\test_ns2\CHost.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)\Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)\Gen\tests\test_ns2\CHost_C.xsd"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_refports/test_refports.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_refports/test_refports.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_refports/test_refports.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -21,6 +21,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -105,6 +106,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -192,10 +194,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -204,10 +206,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -236,10 +238,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -248,10 +250,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -265,46 +267,46 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating UDM API files"
-					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_refports&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_refports\RefPort.h;$(OutDir)\Gen\tests\test_refports\RefPort.cpp;$(OutDir)\Gen\tests\test_refports\RefPort.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Generating UDM API files"
+					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_refports&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_refports\RefPort.h;$(OutDir)\Gen\tests\test_refports\RefPort.cpp;$(OutDir)\Gen\tests\test_refports\RefPort.xsd"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_refports\RefPort_udm.xml"
+			RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort_udm.xml"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
+					Description="Generating UDM API files"
+					CommandLine="&quot;$(OutDir)\UdmD.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_refports&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="$(OutDir)\Gen\tests\test_refports\RefPort.h;$(OutDir)\Gen\tests\test_refports\RefPort.cpp;$(OutDir)\Gen\tests\test_refports\RefPort.xsd"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
+				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating UDM API files"
-					CommandLine="&quot;$(OutDir)\Udm.exe&quot; -o &quot;$(OutDir)\Gen\tests\test_refports&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="$(OutDir)\Gen\tests\test_refports\RefPort.h;$(OutDir)\Gen\tests\test_refports\RefPort.cpp;$(OutDir)\Gen\tests\test_refports\RefPort.xsd"
 				/>
 			</FileConfiguration>
 		</File>

Modified: UDM/trunk/Projects/Win32/VC9/tests/test_simpleudmops/LampTest.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_simpleudmops/LampTest.vcproj	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_simpleudmops/LampTest.vcproj	Fri Jan 28 16:53:58 2011	(r3625)
@@ -20,7 +20,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Release"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -115,7 +115,7 @@
 			OutputDirectory="..\..\..\..\..\Build\Win32\VC9\Debug"
 			IntermediateDirectory="$(OutDir)\obj\tests\$(ProjectName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			InheritedPropertySheets="..\UdmTests.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -216,45 +216,45 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
+					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -310,10 +310,10 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -322,10 +322,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+				RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool

Modified: UDM/trunk/scripts/vc9-env.bat
==============================================================================
--- UDM/trunk/scripts/vc9-env.bat	Fri Jan 28 16:06:00 2011	(r3624)
+++ UDM/trunk/scripts/vc9-env.bat	Fri Jan 28 16:53:58 2011	(r3625)
@@ -23,35 +23,12 @@
 %UDM_3RDPARTY_PATH%\cppunit-1.12.1\bin;^
 %UDM_3RDPARTY_PATH%\info-zip;^
 %UDM_3RDPARTY_PATH%\sed;^
-%UDM_3RDPARTY_PATH%\swigwin-2.0.0;^
 %UDM_3RDPARTY_PATH%\ant-1.6.2\bin;^
 %PATH%
 
-set INCLUDE=%UDM_3RDPARTY_PATH%\xerces-c_2_8_0\include;^
-%UDM_3RDPARTY_PATH%\Xalan-C_1_11_0\include;^
-%UDM_3RDPARTY_PATH%\antlr-2.7.7\lib\cpp;^
-%UDM_3RDPARTY_PATH%\zlib;^
-%UDM_3RDPARTY_PATH%\zlib\contrib\minizip;^
-%UDM_3RDPARTY_PATH%\cppunit-1.12.1\include;^
-%UDM_3RDPARTY_PATH%\boost_1_36_0;^
-%JDK_PATH%\include\win32;^
-%JDK_PATH%\include;^
-%GME_ROOT%\Interfaces;^
-%GME_ROOT%\Gme\Interfaces;^
-%INCLUDE%
-
-set LIB=%UDM_3RDPARTY_PATH%\Xalan-C_1_11_0\lib;^
-%UDM_3RDPARTY_PATH%\xerces-c_2_8_0\lib;^
-%UDM_3RDPARTY_PATH%\zlib;^
-%UDM_3RDPARTY_PATH%\antlr-2.7.7\lib;^
-%UDM_3RDPARTY_PATH%\cppunit-1.12.1\lib;^
-%JDK_PATH%\lib;^
-%LIB%
-
 set JAVA_HOME=%JDK_PATH%
 
-set _CLASSPATH=%UDM_3RDPARTY_PATH%\junit\junit.jar;^
-%UDM_3RDPARTY_PATH%\antlr-2.7.7\antlr.jar
+set _CLASSPATH=$(UDM_3RDPARTY_PATH)\junit\junit.jar;$(UDM_3RDPARTY_PATH)\antlr-2.7.7\antlr.jar
 if defined CLASSPATH (set CLASSPATH=%_CLASSPATH%;%CLASSPATH%) else (set CLASSPATH=%_CLASSPATH%)
 
 set ANT_HOME=%UDM_3RDPARTY_PATH%\ant-1.6.2


More information about the Mobies-commit mailing list