Fixed MSA files so that they have unique names and removed extra copyright and license information in the comment - these are in the header.

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

Tools/Source/Common/Common.msa

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>Common Java Classes</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/Cpptasks/CppTasks.msa

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>CppTasks</ModuleName>
@@ -22,15 +12,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/FrameworkTasks/FrameworkTasks.msa

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>Framework Tasks</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/FrameworkWizard/FrameworkWizard.msa

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>Framework Wizard</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/GenBuild/GenBuild.msa

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>GenBuild</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/SurfaceArea/SurfaceArea.msa

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
-    <ModuleName>GenBuild</ModuleName>
+    <ModuleName>Surface Area Build</ModuleName>
     <ModuleType>TOOL</ModuleType>
     <GuidValue>C21A4ED4-491E-4602-BF94-698EA54F254B</GuidValue>
     <Version>2.0</Version>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>

Tools/Source/TianoTools/TianoTools.msa

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
-    <ModuleName>GenBuild</ModuleName>
+    <ModuleName>Tiano C Tools</ModuleName>
     <ModuleType>TOOL</ModuleType>
     <GuidValue>A169C678-3F55-4b6a-80BF-FD8B8DCAB883</GuidValue>
     <Version>2.0</Version>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
+All rights reserved.
-      This program and the accompanying materials
+This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
+are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
+BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
+license may be found at
-      http://opensource.org/licenses/bsd-license.php
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>