[Mobies-commit] [commit] r4197 - in UDM/trunk: Projects/Win32/VC10/src Projects/Win32/VC10/src/Udm Projects/Win32/VC10/src/UdmDll Projects/Win32/VC10/src/UdmToXmi Projects/Win32/VC10/src/XmiToUdm Projects/Win32/VC9/src/Udm Projects/Win32/VC9/src/UdmDll include lib src/Udm src/UdmDll

ksmyth at redhat3.isis.vanderbilt.edu ksmyth at redhat3.isis.vanderbilt.edu
Fri Sep 27 16:03:12 CDT 2013 

Author: ksmyth
Date: Fri Sep 27 16:03:11 2013
New Revision: 4197

Log:
remove Xalan from UdmDll, Udm.exe

Modified:
   UDM/trunk/Projects/Win32/VC10/src/Udm.sln
   UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/UdmToXmi/UdmToXmi.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/XmiToUdm/XmiToUdm.vcxproj
   UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj
   UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
   UDM/trunk/include/UdmXmi.h
   UDM/trunk/lib/Makefile.am
   UDM/trunk/src/Udm/Udm.cpp
   UDM/trunk/src/UdmDll/UdmDll.cpp

Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln	Fri Sep 27 16:03:11 2013	(r4197)
@@ -125,11 +125,9 @@
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|Win32.Build.0 = Debug|Win32
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.ActiveCfg = Debug|x64
-		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Debug|x64.Build.0 = Debug|x64
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.ActiveCfg = Release|Win32
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|Win32.Build.0 = Release|Win32
 		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.ActiveCfg = Release|x64
-		{CA16ED97-F738-4FAF-985C-FAE05AED8D07}.Release|x64.Build.0 = Release|x64
 		{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
 		{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.ActiveCfg = Debug|x64
 		{E663042B-F135-4502-B7A1-D62F21126E3B}.BootUdmCompile Debug|x64.Build.0 = Debug|x64

Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -51,14 +51,12 @@
     <Import Project="..\zlib.props" />
     <Import Project="..\boost.props" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\zlib.props" />
     <Import Project="..\boost.props" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
@@ -66,14 +64,12 @@
     <Import Project="..\zlib.props" />
     <Import Project="..\boost.props" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\zlib.props" />
     <Import Project="..\boost.props" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -120,7 +116,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-c_2.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -147,7 +143,7 @@
       <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;NO_XALAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -213,7 +209,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>Xalan-C_1.lib;xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -239,7 +235,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;NO_XALAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -329,9 +325,6 @@
       <Project>{e663042b-f135-4502-b7a1-d62f21126e3b}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
-      <Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\Uml\Uml.vcxproj">
       <Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.vcxproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -49,14 +49,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
@@ -64,14 +62,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
@@ -126,7 +122,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UdmUtil.lib;UdmBase.lib;UDMPOI.lib;UdmOcl.lib;Uml.lib;UdmDom.lib;UdmGme.lib;UdmXMI.lib;Xalan-C_1.lib;xerces-c_2.lib;zlib.lib;GOCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>UdmUtil.lib;UdmBase.lib;UDMPOI.lib;UdmOcl.lib;Uml.lib;UdmDom.lib;UdmGme.lib;xerces-c_2.lib;zlib.lib;GOCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -138,7 +134,6 @@
       <ImportLibrary>$(OutDir)UdmDll_VS10.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <DelayLoadDLLs>Xalan-c_1_11.dll</DelayLoadDLLs>
     </Link>
     <PostBuildEvent />
     <CustomBuildStep>
@@ -242,7 +237,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UdmBaseD.lib;UdmOclD.lib;UdmPOID.lib;UmlD.lib;UdmDomD.lib;UdmGmeD.lib;UdmXMID.lib;UdmUtilD.lib;Xalan-C_1.lib;xerces-c_2.lib;zlibD.lib;GOCLD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>UdmBaseD.lib;UdmOclD.lib;UdmPOID.lib;UmlD.lib;UdmDomD.lib;UdmGmeD.lib;UdmUtilD.lib;xerces-c_2.lib;zlibD.lib;GOCLD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -374,14 +369,6 @@
       <Project>{e663042b-f135-4502-b7a1-d62f21126e3b}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
-      <Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
     <ProjectReference Include="..\Uml\Uml.vcxproj">
       <Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -54,14 +54,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
@@ -69,14 +67,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="..\Xerces-c.props" />
-    <Import Project="..\Xalan-c.props" />
     <Import Project="..\zlib.props" />
     <Import Project="..\..\..\..\..\Udm_x64.props" />
     <Import Project="..\..\..\..\..\Udm.props" />
@@ -131,7 +127,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UdmUtil.lib;UdmBase.lib;UDMPOI.lib;UdmOcl.lib;Uml.lib;UdmDom.lib;UdmGme.lib;UdmXMI.lib;Xalan-C_1.lib;xerces-c_2.lib;zlib.lib;GOCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>UdmUtil.lib;UdmBase.lib;UDMPOI.lib;UdmOcl.lib;Uml.lib;UdmDom.lib;UdmGme.lib;xerces-c_2.lib;zlib.lib;GOCL.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -142,7 +138,6 @@
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)UdmDll_$(PlatformToolset)_$(Platform).lib</ImportLibrary>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <DelayLoadDLLs>Xalan-c_1_11.dll</DelayLoadDLLs>
     </Link>
     <PostBuildEvent />
     <CustomBuildStep>
@@ -246,7 +241,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>UdmBaseD.lib;UdmOclD.lib;UdmPOID.lib;UmlD.lib;UdmDomD.lib;UdmGmeD.lib;UdmXMID.lib;UdmUtilD.lib;Xalan-C_1.lib;xerces-c_2.lib;zlibD.lib;GOCLD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>UdmBaseD.lib;UdmOclD.lib;UdmPOID.lib;UmlD.lib;UdmDomD.lib;UdmGmeD.lib;UdmUtilD.lib;xerces-c_2.lib;zlibD.lib;GOCLD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -377,9 +372,6 @@
       <Project>{e663042b-f135-4502-b7a1-d62f21126e3b}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
-      <Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\Uml\Uml.vcxproj">
       <Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmToXmi/UdmToXmi.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmToXmi/UdmToXmi.vcxproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmToXmi/UdmToXmi.vcxproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -128,6 +128,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(TargetPath)" "$(UDM_PATH)"\bin</Command>
@@ -215,6 +216,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(TargetPath)" "$(UDM_PATH)"\bin</Command>
@@ -295,6 +297,9 @@
     <ProjectReference Include="..\UdmDll\UdmDll.vcxproj">
       <Project>{3cae3dee-065e-426c-9c3c-f1f59217c00b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
+      <Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: UDM/trunk/Projects/Win32/VC10/src/XmiToUdm/XmiToUdm.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/XmiToUdm/XmiToUdm.vcxproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC10/src/XmiToUdm/XmiToUdm.vcxproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -126,6 +126,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(TargetPath)" "$(UDM_PATH)"\bin</Command>
@@ -213,6 +214,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>xerces-c_2.lib;Xalan-C_1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy "$(TargetPath)" "$(UDM_PATH)"\bin</Command>
@@ -298,6 +300,9 @@
     <ProjectReference Include="..\UdmDll\UdmDll.vcxproj">
       <Project>{3cae3dee-065e-426c-9c3c-f1f59217c00b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\UdmXmi\UdmXmi.vcxproj">
+      <Project>{ca16ed97-f738-4faf-985c-fae05aed8d07}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm/Udm.vcproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -75,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="UmlD.lib File2CodeD.lib JavaAPIGenD.lib PythonAPIGenD.lib UdmXmiD.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib xerces-c_2.lib Xalan-C_1D.lib zlibD.lib"
+				AdditionalDependencies="UmlD.lib File2CodeD.lib JavaAPIGenD.lib PythonAPIGenD.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib xerces-c_2.lib zlibD.lib"
 				OutputFile="$(OutDir)\UdmD.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -172,7 +172,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Uml.lib File2Code.lib JavaAPIGen.lib PythonAPIGen.lib UdmXmi.lib UdmBase.lib Xalan-C_1.lib UdmDom.lib UdmUtil.lib xerces-c_2.lib zlib.lib"
+				AdditionalDependencies="Uml.lib File2Code.lib JavaAPIGen.lib PythonAPIGen.lib UdmBase.lib UdmDom.lib UdmUtil.lib xerces-c_2.lib zlib.lib"
 				OutputFile="$(OutDir)\Udm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj	Fri Sep 27 16:03:11 2013	(r4197)
@@ -84,7 +84,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="UdmUtil.lib UdmBase.lib UDMPOI.lib UdmOcl.lib Uml.lib UdmDom.lib UdmGme.lib UdmXMI.lib Xalan-C_1.lib xerces-c_2.lib zlib.lib GOCL.lib dbghelp.lib"
+				AdditionalDependencies="UdmUtil.lib UdmBase.lib UDMPOI.lib UdmOcl.lib Uml.lib UdmDom.lib UdmGme.lib xerces-c_2.lib zlib.lib GOCL.lib dbghelp.lib"
 				OutputFile="$(OutDir)\UdmDll_3_2.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -187,7 +187,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="UdmBaseD.lib UdmOclD.lib UdmPOID.lib UmlD.lib UdmDomD.lib UdmGmeD.lib UdmXMID.lib UdmUtilD.lib Xalan-C_1.lib xerces-c_2.lib zlibD.lib GOCLD.lib dbghelp.lib"
+				AdditionalDependencies="UdmBaseD.lib UdmOclD.lib UdmPOID.lib UmlD.lib UdmDomD.lib UdmGmeD.lib UdmUtilD.lib xerces-c_2.lib zlibD.lib GOCLD.lib dbghelp.lib"
 				OutputFile="$(OutDir)\UdmDll_3_2D.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"

Modified: UDM/trunk/include/UdmXmi.h
==============================================================================
--- UDM/trunk/include/UdmXmi.h	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/include/UdmXmi.h	Fri Sep 27 16:03:11 2013	(r4197)
@@ -4,23 +4,11 @@
 
 #include "ErrHand.h"
 
-#ifdef WIN32
-#ifdef UDMXMI_EXPORTS
-#define UDMXMI_API __declspec(dllexport)
-#else
-#define UDMXMI_API __declspec(dllimport)
-#endif
-#endif
-
-
-
-
-
 void initXSLTstr();
 int do_xslt_trans(const char * file_in, const char * file_out, const char * file_xsl);
 
-int UDM_DLL XmiToUdm(const char * in, const char * out);
-int UDM_DLL UdmToXmi(const char * in, const char * out);
+int XmiToUdm(const char * in, const char * out);
+int UdmToXmi(const char * in, const char * out);
 
 
 #endif

Modified: UDM/trunk/lib/Makefile.am
==============================================================================
--- UDM/trunk/lib/Makefile.am	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/lib/Makefile.am	Fri Sep 27 16:03:11 2013	(r4197)
@@ -1,11 +1,8 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-if ! NO_XALAN
-XALANLIBS += ../src/UdmXmi/libudmxmi.la
-endif
-
+ANTLRLIBS=
 if ! NO_ANTLR
-XALANLIBS += ../src/UdmOcl/libudmocl.la \
+ANTLRLIBS += ../src/UdmOcl/libudmocl.la \
 	../src/UdmOclPat/GOCL/src/libgocl.la
 endif
 
@@ -18,7 +15,7 @@
 	../src/UdmBase/libudmbase.la \
 	../src/UdmUtil/libudmutil.la \
 	../src/UdmDom/libudmdom.la \
-	$(XERCESLIBS) $(XALANLIBS) $(MINIZIPLIBS) $(DLOPENLIBS)
+	$(XERCESLIBS) $(ANTLRLIBS) $(MINIZIPLIBS) $(DLOPENLIBS)
 libudm_la_LDFLAGS	= -version-info 3:1:3
 # Force C++ linking
 nodist_EXTRA_libudm_la_SOURCES	= dummy.cxx

Modified: UDM/trunk/src/Udm/Udm.cpp
==============================================================================
--- UDM/trunk/src/Udm/Udm.cpp	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/src/Udm/Udm.cpp	Fri Sep 27 16:03:11 2013	(r4197)
@@ -338,75 +338,6 @@
 			return 0;
 		};
 
-#ifndef NO_XALAN
-		//check for XMI input
-		//1. If there is no DTDPath, it can not be an XMI Input
-
-		bool xmi_input = false;
-
-		if (!UdmDom::DomDataNetwork::DTDPath.empty())
-		{
-			//the input might be XMI
-			//we will try to find out,
-			//but first we reset the DTD Path
-
-			//reset the DTD PATH in the DOM BackEnd,
-			//so the parser will use the Udm.dtd found near the XMI input
-			//save,
-			string _dom_path = UdmDom::DomDataNetwork::DTDPath;
-			//then reset
-			UdmDom::DomDataNetwork::DTDPath = string();
-
-			try
-			{
-				xmi_input = UdmDom::isXmi(inputfile);
-				//it did not fail,
-				//so it means that it has a Uml.dtd near the XML file,
-				//which seems to be able to validate the XML file
-				// either is XMI or not, it's valid, and xmi_input has the right answer
-
-			}
-			catch(udm_exception&)
-			{
-				//there was no Uml.dtd near the file,
-				//so it's not XMI input
-				//we do nothing; The DTD Path will be restored
-				//and probably parsed OK.
-			}
-
-			
-			//re-set the DTD path, the resolver now should find the Uml.dtd in the DTD path and not 
-			//the Uml.dtd(XMI) in the current directory
-			UdmDom::DomDataNetwork::DTDPath = _dom_path;
-		}
-
-		//The actual parsing happens somewhere here!
-		//now the entity resolver should look for files in the current directory
-		
-		//if it has not succeded, the user probably wants to 
-		//open a normal UDM UML XML file, and needs the DTD path for this.
-
-		//if it was XMI, convert it to UDM
-		if (xmi_input)
-		{
-			if (UdmDom::DomDataNetwork::DTDPath.empty())
-				throw udm_exception("DTD Path empty. When generating API directly from XMI input, the use of the DTD path switch is not optional. In the location pointed by DTDPath the UDM's Uml.dtd should reside. In the same directory with the input XMI the Uml.dtd defined by OMG should reside.");
-			
-			//compute the name of the new file
-			string input_udm = inputfile + "_udm.xml";
-
-			//do the XmiTUdm conversion
-			if (XmiToUdm(inputfile.c_str(), input_udm.c_str()) != 0)
-			{
-				throw udm_exception("An error occurred during translating from XMI UML to UDM UML.");
-			}
-
-			//set the input to the newly converted file
-			inputfile = input_udm;
-
-		}
-#endif /* NO_XALAN */
-
 		UdmDom::DomDataNetwork  nw(Uml::diagram);
 		nw.OpenExisting(inputfile,"", Udm::CHANGES_LOST_DEFAULT);
 		::Uml::Diagram diagram = ::Uml::Diagram::Cast(nw.GetRootObject());

Modified: UDM/trunk/src/UdmDll/UdmDll.cpp
==============================================================================
--- UDM/trunk/src/UdmDll/UdmDll.cpp	Fri Sep 27 12:35:17 2013	(r4196)
+++ UDM/trunk/src/UdmDll/UdmDll.cpp	Fri Sep 27 16:03:11 2013	(r4197)
@@ -16,6 +16,5 @@
 #include <cint_string.h>
 #include <UdmOcl.h>
 __pragma(comment(linker, "/include:?UnInitialize at Ocl@@YAXXZ"))
-__pragma(comment(linker, "/include:?XmiToUdm@@YAHPBD0 at Z"))
 #endif

More information about the Mobies-commit mailing list