Mon Aug 9 06:58:12 EDT 2010

Author: jng
Date: 2010-08-09 10:58:12 +0000 (Mon, 09 Aug 2010)
New Revision: 5078

Modified:
   trunk/Tools/Maestro/
   trunk/Tools/Maestro/Installer/UpgradeData.wxi
   trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceValidators/Strings/FeatureSourceValidator.da-DK.resx
   trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceValidators/Strings/FeatureSourceValidator.es-ES.resx
   trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.fr-FR.resx
   trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resources
   trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resx
   trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
Log:
Prep for 2.1.1 release


Property changes on: trunk/Tools/Maestro
___________________________________________________________________
Modified: svn:ignore
   - *.suo

   + *.suo
InstallerTempRelease


Modified: trunk/Tools/Maestro/Installer/UpgradeData.wxi
===================================================================

--- trunk/Tools/Maestro/Installer/UpgradeData.wxi	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Installer/UpgradeData.wxi	2010-08-09 10:58:12 UTC (rev 5078)
@@ -3,7 +3,7 @@
   <?define UpgradeCode="A7C2ECB3-1991-47B9-A22E-8844BB95CAE2" ?>
 
   <!-- Remember to change product version on each install -->
-  <?define ProductVersion="2.1.0.4996" ?>
+  <?define ProductVersion="2.1.1.5078" ?>
 
   <?define Manufacturer="Open Source Geospatial Foundation" ?>
 

Modified: trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Localization/ConvertResX/ConvertResX/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceValidators/Strings/FeatureSourceValidator.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceValidators/Strings/FeatureSourceValidator.da-DK.resx	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceValidators/Strings/FeatureSourceValidator.da-DK.resx	2010-08-09 10:58:12 UTC (rev 5078)
@@ -149,4 +149,8 @@
     <value>En fejl opstod under læsning af spatial information: {0}</value>
     <comment>An error message that is displayed if the spatial context could not be read</comment>
   </data>
+  <data name="NoPrimaryKeyOrView" xml:space="preserve">
+    <value>Could not obtain identity properties for {0}. This class either has no identity properties and/or is derived from a view with no uniquely identifiable columns. Attempting to create feature joins from this class may produce unexpected results.</value>
+    <comment>A warning message that is displayed when we can't obtain identity properties from a class because it is a view</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceValidators/Strings/FeatureSourceValidator.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceValidators/Strings/FeatureSourceValidator.es-ES.resx	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceValidators/Strings/FeatureSourceValidator.es-ES.resx	2010-08-09 10:58:12 UTC (rev 5078)
@@ -149,4 +149,8 @@
     <value>Failed to read spatial context: {0}</value>
     <comment>An error message that is displayed if the spatial context could not be read</comment>
   </data>
+  <data name="NoPrimaryKeyOrView" xml:space="preserve">
+    <value>Could not obtain identity properties for {0}. This class either has no identity properties and/or is derived from a view with no uniquely identifiable columns. Attempting to create feature joins from this class may produce unexpected results.</value>
+    <comment>A warning message that is displayed when we can't obtain identity properties from a class because it is a view</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.fr-FR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.fr-FR.resx	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.fr-FR.resx	2010-08-09 10:58:12 UTC (rev 5078)
@@ -149,4 +149,8 @@
     <value>Impossible de lire le contexte spatial : {0}</value>
     <comment>An error message that is displayed if the spatial context could not be read</comment>
   </data>
+  <data name="NoPrimaryKeyOrView" xml:space="preserve">
+    <value>Could not obtain identity properties for {0}. This class either has no identity properties and/or is derived from a view with no uniquely identifiable columns. Attempting to create feature joins from this class may produce unexpected results.</value>
+    <comment>A warning message that is displayed when we can't obtain identity properties from a class because it is a view</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resources
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resx	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Localization/hr-HR/Maestro/ResourceValidators/Strings/FeatureSourceValidator.hr-HR.resx	2010-08-09 10:58:12 UTC (rev 5078)
@@ -149,4 +149,8 @@
     <value>Failed to read spatial context: {0}</value>
     <comment>An error message that is displayed if the spatial context could not be read</comment>
   </data>
+  <data name="NoPrimaryKeyOrView" xml:space="preserve">
+    <value>Could not obtain identity properties for {0}. This class either has no identity properties and/or is derived from a view with no uniquely identifiable columns. Attempting to create feature joins from this class may produce unexpected results.</value>
+    <comment>A warning message that is displayed when we can't obtain identity properties from a class because it is a view</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4996")]
+[assembly: AssemblyFileVersionAttribute("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/FusionEditor/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4996")]
+[assembly: AssemblyFileVersionAttribute("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/LoginForm/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/MaestroEditorInterface/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/ResourceBrowser/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -50,5 +50,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4996")]
+[assembly: AssemblyFileVersionAttribute("2.1.1.5078")]

Modified: trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/Maestro/ResourceValidators/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4996")]
+[assembly: AssemblyFileVersionAttribute("2.1.1.5078")]

Modified: trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/MaestroAPI/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -45,7 +45,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -75,4 +75,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("..\\..\\maestroapi.key")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersionAttribute("2.1.0.4996")]
+[assembly: AssemblyFileVersionAttribute("2.1.1.5078")]

Modified: trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/MaestroAPI/PackageBuilder/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/MaestroAPI/XsdGenerator new w generics/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/MgCooker/MgCookerCommandline/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

Modified: trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2010-08-07 11:53:15 UTC (rev 5077)
+++ trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2010-08-09 10:58:12 UTC (rev 5078)
@@ -48,5 +48,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.0.4996")]
-[assembly: AssemblyFileVersion("2.1.0.4996")]
+[assembly: AssemblyVersion("2.1.1.5078")]
+[assembly: AssemblyFileVersion("2.1.1.5078")]

