Update several MSA/Filenames which do not inconsistent with current source files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1838 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 58 insertions, 36 deletions

diff --git a/Tools/Java/Source/Common/Common.msa b/Tools/Java/Source/Common/Common.msa
index fa7f93a5cf..6c07455b1f 100644
--- a/Tools/Java/Source/Common/Common.msa
+++ b/Tools/Java/Source/Common/Common.msa
@@ -34,9 +34,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </ModuleDefinitions>

   <SourceFiles>

     <Filename>build.xml</Filename>

-    <Filename>org/tianocore/exception/EdkException.java</Filename>

-    <Filename>org/tianocore/logger/DefaultLogger.java</Filename>

-    <Filename>org/tianocore/logger/EdkLog.java</Filename>

-    <Filename>org/tianocore/logger/LogMethod.java</Filename>

+    <Filename>org/tianocore/common/cache/FileTimeStamp.java</Filename>

+    

+    <Filename>org/tianocore/common/definitions/EdkDefinitions.java</Filename>

+    <Filename>org/tianocore/common/definitions/ToolDefinitions.java</Filename>

+    

+    <Filename>org/tianocore/common/exception/EdkException.java</Filename>

+    

+    <Filename>org/tianocore/common/logger/DefaultLogger.java</Filename>

+    <Filename>org/tianocore/common/logger/EdkLog.java</Filename>

+    <Filename>org/tianocore/common/logger/LogMethod.java</Filename>

   </SourceFiles>

 </ModuleSurfaceArea>

diff --git a/Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa b/Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa
index eb5fe8be0f..f7b1b6225f 100644
--- a/Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa
+++ b/Tools/Java/Source/FrameworkTasks/FrameworkTasks.msa
@@ -45,13 +45,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>org/tianocore/framework/tasks/EfiRomTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/FfsHeader.java</Filename>

     <Filename>org/tianocore/framework/tasks/FfsTypes.java</Filename>

-    <Filename>org/tianocore/framework/tasks/FileParser.java</Filename>

+    <Filename>org/tianocore/framework/tasks/FileArg.java</Filename>

     <Filename>org/tianocore/framework/tasks/FlashMapTask.java</Filename>

-    <Filename>org/tianocore/framework/tasks/FrameworkLogger.java</Filename>

     <Filename>org/tianocore/framework/tasks/FwImageTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/GenAcpiTableTask.java</Filename>

-    <Filename>org/tianocore/framework/tasks/GenCapsuleHdrTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/GenCRC32SectionTask.java</Filename>

+    <Filename>org/tianocore/framework/tasks/GenCapsuleHdrTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/GenDepexTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/GenFfsFileTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/GenFvImageTask.java</Filename>

@@ -62,6 +61,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>org/tianocore/framework/tasks/Input.java</Filename>

     <Filename>org/tianocore/framework/tasks/InputFile.java</Filename>

     <Filename>org/tianocore/framework/tasks/MakeDeps.java</Filename>

+    <Filename>org/tianocore/framework/tasks/ModifyInfTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/NestElement.java</Filename>

     <Filename>org/tianocore/framework/tasks/PeiReBaseTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/SecApResetVectorFixupTask.java</Filename>

@@ -77,6 +77,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>org/tianocore/framework/tasks/ToolArg.java</Filename>

     <Filename>org/tianocore/framework/tasks/VfrCompilerTask.java</Filename>

     <Filename>org/tianocore/framework/tasks/ZeroDebugDataTask.java</Filename>

-    <Filename>org/tianocore/framework/tasks/ModifyInfTask.java</Filename>

   </SourceFiles>

 </ModuleSurfaceArea>

diff --git a/Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa
index b8166c5f36..85d1b88fe6 100644
--- a/Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa
+++ b/Tools/Java/Source/FrameworkWizard/FrameworkWizard.msa
@@ -34,7 +34,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </ModuleDefinitions>

   <SourceFiles>

     <Filename>build.xml</Filename>

-    <Filename>FrameworkWizard.msa</Filename>

     <Filename>MANIFEST.MF</Filename>

     <Filename>rsc/resources/images/logo.gif</Filename>

     <Filename>rsc/resources/images/No.JPG</Filename>

@@ -62,8 +61,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/common/XmlConfig.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/Find.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/FindResult.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/common/find/FindResultDetailInfo.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/common/find/FindResultId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/GuidId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/LibraryClassId.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/common/find/PcdFindResultId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/PcdId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/PpiId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/find/ProtocolId.java</Filename>

@@ -102,7 +104,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/far/FarMd5.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/far/FarPackage.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/far/FarPlatformItem.java</Filename>

-    <Filename>src/org/tianocore/frameworkwizard/far/Mainfest.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/far/FarStringDefinition.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/far/Manifest.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/far/ManifestInterface.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/far/PackageQuery.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java</Filename>

@@ -151,7 +154,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java</Filename>

-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java</Filename>

@@ -201,6 +203,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFvOptions.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java</Filename>

@@ -209,8 +212,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/LongTextEditor.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/TableSorter.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/LibraryClassDescriptor.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/toolchain/Preferences.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/toolchain/ToolChainId.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/workspace/Workspace.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java</Filename>

diff --git a/Tools/Java/Source/GenBuild/GenBuild.msa b/Tools/Java/Source/GenBuild/GenBuild.msa
index d982cae2fc..bfddea1ff7 100644
--- a/Tools/Java/Source/GenBuild/GenBuild.msa
+++ b/Tools/Java/Source/GenBuild/GenBuild.msa
@@ -35,21 +35,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <SourceFiles>

     <Filename>build.xml</Filename>

     <Filename>GenBuild.tasks</Filename>

+    <Filename>org/tianocore/build/FfsProcess.java</Filename>

+    <Filename>org/tianocore/build/FileProcess.java</Filename>

+    <Filename>org/tianocore/build/FrameworkBuildTask.java</Filename>

+    <Filename>org/tianocore/build/GenBuildTask.java</Filename>

+    <Filename>org/tianocore/build/ModuleBuildFileGenerator.java</Filename>

+    <Filename>org/tianocore/build/GenBuildThread.java</Filename>

+    

     <Filename>org/tianocore/build/autogen/AutoGen.java</Filename>

     <Filename>org/tianocore/build/autogen/AutogenLibOrder.java</Filename>

     <Filename>org/tianocore/build/autogen/CommonDefinition.java</Filename>

+    

     <Filename>org/tianocore/build/exception/AutoGenException.java</Filename>

-    <Filename>org/tianocore/build/exception/EdkException.java</Filename>

     <Filename>org/tianocore/build/exception/GenBuildException.java</Filename>

     <Filename>org/tianocore/build/exception/PcdAutogenException.java</Filename>

-    <Filename>org/tianocore/build/exception/TianoToolsException.java</Filename>

+    <Filename>org/tianocore/build/exception/PlatformPcdPreprocessBuildException.java</Filename>

     <Filename>org/tianocore/build/exception/XmlParseException.java</Filename>

-    <Filename>org/tianocore/build/FfsProcess.java</Filename>

-    <Filename>org/tianocore/build/FileProcess.java</Filename>

+

     <Filename>org/tianocore/build/fpd/FpdParserTask.java</Filename>

     <Filename>org/tianocore/build/fpd/PlatformBuildFileGenerator.java</Filename>

-    <Filename>org/tianocore/build/FrameworkBuildTask.java</Filename>

-    <Filename>org/tianocore/build/GenBuildTask.java</Filename>

+    <Filename>org/tianocore/build/fpd/FpdParserForThread.java</Filename>

+

     <Filename>org/tianocore/build/global/DpFile.java</Filename>

     <Filename>org/tianocore/build/global/DpFileList.java</Filename>

     <Filename>org/tianocore/build/global/GenBuildLogger.java</Filename>

@@ -59,26 +65,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>org/tianocore/build/global/Spd.java</Filename>

     <Filename>org/tianocore/build/global/SurfaceAreaQuery.java</Filename>

     <Filename>org/tianocore/build/global/VariableTask.java</Filename>

+    

     <Filename>org/tianocore/build/id/FpdModuleIdentification.java</Filename>

     <Filename>org/tianocore/build/id/Identification.java</Filename>

     <Filename>org/tianocore/build/id/ModuleIdentification.java</Filename>

     <Filename>org/tianocore/build/id/PackageIdentification.java</Filename>

     <Filename>org/tianocore/build/id/PlatformIdentification.java</Filename>

-    <Filename>org/tianocore/build/ModuleBuildFileGenerator.java</Filename>

-    <Filename>org/tianocore/build/OutputDirSetup.java</Filename>

-    <Filename>org/tianocore/build/pcd/action/CollectPCDAction.java</Filename>

-    <Filename>org/tianocore/build/pcd/action/PcdDatabase.java</Filename>

+

     <Filename>org/tianocore/build/pcd/action/PCDAutoGenAction.java</Filename>

+    <Filename>org/tianocore/build/pcd/action/PcdDatabase.java</Filename>

+    <Filename>org/tianocore/build/pcd/action/PlatformPcdPreprocessActionForBuilding.java</Filename>

+    

     <Filename>org/tianocore/build/toolchain/ConfigReader.java</Filename>

-    <Filename>org/tianocore/build/toolchain/ToolChainAttribute.java</Filename>

     <Filename>org/tianocore/build/toolchain/ToolChainConfig.java</Filename>

     <Filename>org/tianocore/build/toolchain/ToolChainElement.java</Filename>

     <Filename>org/tianocore/build/toolchain/ToolChainInfo.java</Filename>

     <Filename>org/tianocore/build/toolchain/ToolChainKey.java</Filename>

     <Filename>org/tianocore/build/toolchain/ToolChainMap.java</Filename>

-    <Filename>org/tianocore/build/toolchain/ToolChainTask.java</Filename>

-    <Filename>org/tianocore/build/tools/DefaultBuildFileGenerator.java</Filename>

+    

     <Filename>org/tianocore/build/tools/ModuleItem.java</Filename>

     <Filename>org/tianocore/build/tools/PackageItem.java</Filename>

   </SourceFiles>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/Tools/Java/Source/MigrationTools/MigrationTools.msa b/Tools/Java/Source/MigrationTools/MigrationTools.msa
index db02b240b1..8160bcc8ba 100644
--- a/Tools/Java/Source/MigrationTools/MigrationTools.msa
+++ b/Tools/Java/Source/MigrationTools/MigrationTools.msa
@@ -31,18 +31,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </ModuleDefinitions>

   <SourceFiles>

     <Filename>build.xml</Filename>

+    <Filename>org/tianocore/migration/Common.java</Filename>

+    <Filename>org/tianocore/migration/Critic.java</Filename>

     <Filename>org/tianocore/migration/Database.java</Filename>

-    <Filename>org/tianocore/migration/FirstPanel.java</Filename> 

-    <Filename>org/tianocore/migration/Func.java</Filename> 

-    <Filename>org/tianocore/migration/Guid.java</Filename> 

-    <Filename>org/tianocore/migration/Macro.java</Filename> 

-    <Filename>org/tianocore/migration/ModuleInfo.java</Filename> 

-    <Filename>org/tianocore/migration/ModuleReader.java</Filename> 

-    <Filename>org/tianocore/migration/MsaWriter.java</Filename> 

+    <Filename>org/tianocore/migration/FirstPanel.java</Filename>

+    <Filename>org/tianocore/migration/Func.java</Filename>

+    <Filename>org/tianocore/migration/Guid.java</Filename>

+    <Filename>org/tianocore/migration/Macro.java</Filename>

+    <Filename>org/tianocore/migration/MigrationTool.java</Filename>

+    <Filename>org/tianocore/migration/ModuleInfo.java</Filename>

+    <Filename>org/tianocore/migration/ModuleReader.java</Filename>

+    <Filename>org/tianocore/migration/MsaOwner.java</Filename>

+    <Filename>org/tianocore/migration/MsaTreeEditor.java</Filename>

+    <Filename>org/tianocore/migration/MsaWriter.java</Filename>

+    <Filename>org/tianocore/migration/PathIterator.java</Filename>

     <Filename>org/tianocore/migration/SourceFileReplacer.java</Filename>

     <Filename>org/tianocore/migration/UI.java</Filename>

-    <Filename>org/tianocore/migration/MsaTreeEditor.java</Filename> 

-    <Filename>org/tianocore/migration/Critic.java</Filename> 

-    <Filename>org/tianocore/migration/Common.java</Filename>

   </SourceFiles>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/Tools/Java/Source/PcdTools/PcdTools.msa b/Tools/Java/Source/PcdTools/PcdTools.msa
index 3b47a92cbd..11a68567ec 100644
--- a/Tools/Java/Source/PcdTools/PcdTools.msa
+++ b/Tools/Java/Source/PcdTools/PcdTools.msa
@@ -31,15 +31,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </ModuleDefinitions>

   <SourceFiles>

     <Filename>build.xml</Filename>

-    <Filename>org/tianocore/pcd/action/ActionMessage.java</Filename>

+    <Filename>org/tianocore/pcd/action/PlatformPcdPreprocessAction.java</Filename>

     <Filename>org/tianocore/pcd/action/BuildAction.java</Filename>

+    <Filename>org/tianocore/pcd/entity/CommonDefinition.java</Filename>

     <Filename>org/tianocore/pcd/entity/DynamicTokenValue.java</Filename>

     <Filename>org/tianocore/pcd/entity/MemoryDatabaseManager.java</Filename>

+    <Filename>org/tianocore/pcd/entity/ModulePcdInfoFromFpd.java</Filename>

     <Filename>org/tianocore/pcd/entity/SkuInstance.java</Filename>

     <Filename>org/tianocore/pcd/entity/Token.java</Filename>

     <Filename>org/tianocore/pcd/entity/UsageInstance.java</Filename>

     <Filename>org/tianocore/pcd/exception/BuildActionException.java</Filename>

     <Filename>org/tianocore/pcd/exception/EntityException.java</Filename>

+    <Filename>org/tianocore/pcd/exception/PlatformPcdPreprocessException.java</Filename>

     <Filename>org/tianocore/pcd/exception/UIException.java</Filename>

   </SourceFiles>

 </ModuleSurfaceArea>