[mapguide-commits] r8510 - in trunk/Tools/Maestro: Maestro Maestro.Editors Maestro.Editors/Common Maestro.Editors/Common/Expression OSGeo.MapGuide.MaestroAPI.Expressions OSGeo.MapGuide.MaestroAPI.Tests

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Jan 20 05:35:50 PST 2015


Author: jng
Date: 2015-01-20 05:35:50 -0800 (Tue, 20 Jan 2015)
New Revision: 8510

Added:
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.FDO.Expressions.csproj
Removed:
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.MapGuide.MaestroAPI.Expressions.csproj
Modified:
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
   trunk/Tools/Maestro/Maestro/Maestro_All.sln
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryExpression.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoComparisonCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDataValue.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDistanceCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpression.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpressionGrammar.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilterGrammar.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFunction.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometricCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometryValue.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoIdentifier.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoInCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLiteralValue.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoNullCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParameter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSearchCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSpatialCondition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoTerminalNames.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryExpression.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoValueExpression.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ExpressionTests.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
Log:
#2525: Rename Expression library to something more appropriate

Modified: trunk/Tools/Maestro/Maestro/Maestro_All.sln
===================================================================
--- trunk/Tools/Maestro/Maestro/Maestro_All.sln	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro/Maestro_All.sln	2015-01-20 13:35:50 UTC (rev 8510)
@@ -120,7 +120,7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.MapGuide.ObjectModels.Tests", "..\OSGeo.MapGuide.ObjectModel.Tests\OSGeo.MapGuide.ObjectModels.Tests.csproj", "{D32BE7DB-D0C3-4805-A057-18312370C57E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.MapGuide.MaestroAPI.Expressions", "..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.MapGuide.MaestroAPI.Expressions.csproj", "{DA2CC031-200B-4F99-A0A9-2E95374BE78F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.FDO.Expressions", "..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.FDO.Expressions.csproj", "{DA2CC031-200B-4F99-A0A9-2E95374BE78F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -19,7 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -19,7 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -19,7 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -19,7 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -27,7 +27,7 @@
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
 using OSGeo.MapGuide.ObjectModels.Capabilities.v1_0_0;

Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj	2015-01-20 13:35:50 UTC (rev 8510)
@@ -2002,9 +2002,9 @@
       <Project>{CFD19053-2172-41D3-8460-0FD2123A1E88}</Project>
       <Name>Maestro.Shared.UI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.MapGuide.MaestroAPI.Expressions.csproj">
+    <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.FDO.Expressions.csproj">
       <Project>{da2cc031-200b-4f99-a0a9-2e95374be78f}</Project>
-      <Name>OSGeo.MapGuide.MaestroAPI.Expressions</Name>
+      <Name>OSGeo.FDO.Expressions</Name>
     </ProjectReference>
     <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI\OSGeo.MapGuide.MaestroAPI.csproj">
       <Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryExpression.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryExpression.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum BinaryOperator
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryLogicalOperator.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoBinaryLogicalOperator.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum BinaryLogicalOperations
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoComparisonCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoComparisonCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoComparisonCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum ComparisonOperations
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDataValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDataValue.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDataValue.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum DataType
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDistanceCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDistanceCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoDistanceCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum DistanceOperations
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpression.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpression.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum ExpressionType
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpressionGrammar.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpressionGrammar.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoExpressionGrammar.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Text;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     [Language("FDO Expression", "1.0", "FDO Expression Grammar")]
     public class FdoExpressionGrammar : Grammar

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilter.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilter.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum FilterType
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilterGrammar.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilterGrammar.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFilterGrammar.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Text;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     [Language("FDO Filter", "1.0", "FDO Filter Grammar")]
     public class FdoFilterGrammar : Grammar

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFunction.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFunction.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoFunction.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoFunction : FdoExpression
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometricCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometricCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometricCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public abstract class FdoGeometricCondition : FdoSearchCondition
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometryValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometryValue.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoGeometryValue.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoGeometryValue : FdoLiteralValue
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoIdentifier.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoIdentifier.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoIdentifier.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoIdentifier : FdoExpression
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoInCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoInCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoInCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoInCondition : FdoSearchCondition
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLiteralValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLiteralValue.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLiteralValue.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum LiteralValueType
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLogicalOperator.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoLogicalOperator.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public abstract class FdoLogicalOperator : FdoFilter
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoNullCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoNullCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoNullCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoNullCondition : FdoSearchCondition
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParameter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParameter.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParameter.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoParameter : FdoValueExpression
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseException.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseException.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     [Serializable]
     public class FdoParseException : Exception

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseable.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoParseable.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public abstract class FdoParseable
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSearchCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSearchCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSearchCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public abstract class FdoSearchCondition : FdoFilter
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSpatialCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSpatialCondition.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoSpatialCondition.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public enum SpatialOperations
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoTerminalNames.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoTerminalNames.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoTerminalNames.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     internal class FdoTerminalNames
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryExpression.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryExpression.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoUnaryExpression : FdoExpression
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryLogicalOperator.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoUnaryLogicalOperator.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public class FdoUnaryLogicalOperator : FdoLogicalOperator
     {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoValueExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoValueExpression.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/FdoValueExpression.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -26,7 +26,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions
+namespace OSGeo.FDO.Expressions
 {
     public abstract class FdoValueExpression : FdoExpression
     {

Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.FDO.Expressions.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.FDO.Expressions.csproj	                        (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.FDO.Expressions.csproj	2015-01-20 13:35:50 UTC (rev 8510)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DA2CC031-200B-4F99-A0A9-2E95374BE78F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OSGeo.FDO.Expressions</RootNamespace>
+    <AssemblyName>OSGeo.FDO.Expressions</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\SDK\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\SDK\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>..\SDK\bin\OSGeo.FDO.Expressions.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Irony">
+      <HintPath>..\Maestro\packages\Irony.0.9.0\lib\net45\Irony.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Properties\GlobalAssemblyInfo.cs">
+      <Link>GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Properties\SignedAssemblyInfo.cs">
+      <Link>SignedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="FdoBinaryExpression.cs" />
+    <Compile Include="FdoBinaryLogicalOperator.cs" />
+    <Compile Include="FdoComparisonCondition.cs" />
+    <Compile Include="FdoDataValue.cs" />
+    <Compile Include="FdoDistanceCondition.cs" />
+    <Compile Include="FdoExpression.cs" />
+    <Compile Include="FdoExpressionGrammar.cs" />
+    <Compile Include="FdoFilterGrammar.cs" />
+    <Compile Include="FdoFilter.cs" />
+    <Compile Include="FdoFunction.cs" />
+    <Compile Include="FdoGeometricCondition.cs" />
+    <Compile Include="FdoGeometryValue.cs" />
+    <Compile Include="FdoIdentifier.cs" />
+    <Compile Include="FdoInCondition.cs" />
+    <Compile Include="FdoLiteralValue.cs" />
+    <Compile Include="FdoLogicalOperator.cs" />
+    <Compile Include="FdoNullCondition.cs" />
+    <Compile Include="FdoParameter.cs" />
+    <Compile Include="FdoParseable.cs" />
+    <Compile Include="FdoParseException.cs" />
+    <Compile Include="FdoSearchCondition.cs" />
+    <Compile Include="FdoSpatialCondition.cs" />
+    <Compile Include="FdoTerminalNames.cs" />
+    <Compile Include="FdoUnaryExpression.cs" />
+    <Compile Include="FdoUnaryLogicalOperator.cs" />
+    <Compile Include="FdoValueExpression.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Strings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Strings.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Strings.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

Deleted: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.MapGuide.MaestroAPI.Expressions.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.MapGuide.MaestroAPI.Expressions.csproj	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/OSGeo.MapGuide.MaestroAPI.Expressions.csproj	2015-01-20 13:35:50 UTC (rev 8510)
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DA2CC031-200B-4F99-A0A9-2E95374BE78F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OSGeo.MapGuide.MaestroAPI.Expressions</RootNamespace>
-    <AssemblyName>OSGeo.MapGuide.MaestroAPI.Expressions</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\SDK\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\SDK\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.Expressions.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Irony">
-      <HintPath>..\Maestro\packages\Irony.0.9.0\lib\net45\Irony.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Properties\GlobalAssemblyInfo.cs">
-      <Link>GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\Properties\SignedAssemblyInfo.cs">
-      <Link>SignedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="FdoBinaryExpression.cs" />
-    <Compile Include="FdoBinaryLogicalOperator.cs" />
-    <Compile Include="FdoComparisonCondition.cs" />
-    <Compile Include="FdoDataValue.cs" />
-    <Compile Include="FdoDistanceCondition.cs" />
-    <Compile Include="FdoExpression.cs" />
-    <Compile Include="FdoExpressionGrammar.cs" />
-    <Compile Include="FdoFilterGrammar.cs" />
-    <Compile Include="FdoFilter.cs" />
-    <Compile Include="FdoFunction.cs" />
-    <Compile Include="FdoGeometricCondition.cs" />
-    <Compile Include="FdoGeometryValue.cs" />
-    <Compile Include="FdoIdentifier.cs" />
-    <Compile Include="FdoInCondition.cs" />
-    <Compile Include="FdoLiteralValue.cs" />
-    <Compile Include="FdoLogicalOperator.cs" />
-    <Compile Include="FdoNullCondition.cs" />
-    <Compile Include="FdoParameter.cs" />
-    <Compile Include="FdoParseable.cs" />
-    <Compile Include="FdoParseException.cs" />
-    <Compile Include="FdoSearchCondition.cs" />
-    <Compile Include="FdoSpatialCondition.cs" />
-    <Compile Include="FdoTerminalNames.cs" />
-    <Compile Include="FdoUnaryExpression.cs" />
-    <Compile Include="FdoUnaryLogicalOperator.cs" />
-    <Compile Include="FdoValueExpression.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Strings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Strings.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/Strings.Designer.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Expressions/Strings.Designer.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.MaestroAPI.Expressions {
+namespace OSGeo.FDO.Expressions {
     using System;
     
     
@@ -39,7 +39,7 @@
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OSGeo.MapGuide.MaestroAPI.Expressions.Strings", typeof(Strings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OSGeo.FDO.Expressions.Strings", typeof(Strings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ExpressionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ExpressionTests.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ExpressionTests.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -25,7 +25,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 
 namespace OSGeo.MapGuide.MaestroAPI.Tests
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/FilterTests.cs	2015-01-20 13:35:50 UTC (rev 8510)
@@ -20,7 +20,7 @@
 
 #endregion Disclaimer / License
 using NUnit.Framework;
-using OSGeo.MapGuide.MaestroAPI.Expressions;
+using OSGeo.FDO.Expressions;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj	2015-01-20 11:34:52 UTC (rev 8509)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/OSGeo.MapGuide.MaestroAPI.Tests.csproj	2015-01-20 13:35:50 UTC (rev 8510)
@@ -82,9 +82,9 @@
     <Compile Include="ValidationTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.MapGuide.MaestroAPI.Expressions.csproj">
+    <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI.Expressions\OSGeo.FDO.Expressions.csproj">
       <Project>{da2cc031-200b-4f99-a0a9-2e95374be78f}</Project>
-      <Name>OSGeo.MapGuide.MaestroAPI.Expressions</Name>
+      <Name>OSGeo.FDO.Expressions</Name>
     </ProjectReference>
     <ProjectReference Include="..\OSGeo.MapGuide.MaestroAPI.Http\OSGeo.MapGuide.MaestroAPI.Http.csproj">
       <Project>{6ef1e775-444b-4e5f-87fb-d687c43a68d7}</Project>



More information about the mapguide-commits mailing list