[mapguide-commits] r5559 - in sandbox/maestro-3.0: .
ExtendedModels/LayerDefinition-1.1.0
ExtendedModels/LayerDefinition-1.2.0
ExtendedModels/LayerDefinition-1.3.0
ExtendedModels/LoadProcedure-1.1.0
ExtendedModels/LoadProcedure-2.2.0
ExtendedModels/SymbolDefinition-1.1.0
ExtendedModels/WebLayout-1.1.0 Maestro
Maestro.AddIn.ExtendedObjectModels
Maestro.AddIn.ExtendedObjectModels/Templates Maestro.Base
Maestro.Base/Commands Maestro.Base/UI Maestro.Editors
Maestro.Login Maestro.Packaging Maestro.Shared.UI
MaestroFsPreview MgCooker OSGeo.MapGuide.MaestroAPI
OSGeo.MapGuide.MaestroAPI/Schema OSGeo.MapGuide.MaestroAPI.Http
OSGeo.MapGuide.MaestroAPI.Native
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Feb 18 08:05:10 EST 2011
Author: jng
Date: 2011-02-18 05:05:10 -0800 (Fri, 18 Feb 2011)
New Revision: 5559
Modified:
sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.csproj
sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.2.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.csproj
sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.3.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.csproj
sandbox/maestro-3.0/ExtendedModels/LoadProcedure-1.1.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.csproj
sandbox/maestro-3.0/ExtendedModels/LoadProcedure-2.2.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.csproj
sandbox/maestro-3.0/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj
sandbox/maestro-3.0/ExtendedModels/WebLayout-1.1.0/OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj
sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
sandbox/maestro-3.0/Maestro.Base/Commands/CutCommand.cs
sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs
sandbox/maestro-3.0/Maestro.Base/Workbench.cs
sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
sandbox/maestro-3.0/Maestro.Login/Maestro.Login.csproj
sandbox/maestro-3.0/Maestro.Packaging/Maestro.Packaging.csproj
sandbox/maestro-3.0/Maestro.Shared.UI/Maestro.Shared.UI.csproj
sandbox/maestro-3.0/Maestro/Maestro.csproj
sandbox/maestro-3.0/MaestroFsPreview/MaestroFsPreview.csproj
sandbox/maestro-3.0/MgCooker/MgCooker.csproj
sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj
sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs
sandbox/maestro-3.0/build.bat
Log:
#1591: Fix validation blowing up on raster feature sources.
Also re-org the SDK component projects to build to the same directory in both debug and release mode. This way, the main Maestro project can be debugged in both configurations as the referenced assemblies will be in the same location regardless of configuration.
The build.bat clean step now wipes the specified output directories in addition to running the clean target on the respective solution files ensuring that debug/release binaries will not get mixed up.
Modified: sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LDF_110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LDF_110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.2.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.2.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.2.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LDF_120</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LDF_120</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.3.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.3.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/LayerDefinition-1.3.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LDF_130</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LDF_130</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/LoadProcedure-1.1.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/LoadProcedure-1.1.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/LoadProcedure-1.1.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LP110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LP110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/LoadProcedure-2.2.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/LoadProcedure-2.2.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/LoadProcedure-2.2.0/OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LP220</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LP220</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/ExtendedModels/WebLayout-1.1.0/OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj
===================================================================
--- sandbox/maestro-3.0/ExtendedModels/WebLayout-1.1.0/OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/ExtendedModels/WebLayout-1.1.0/OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;WL110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;WL110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/Maestro/Maestro.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro/Maestro.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro/Maestro.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -35,28 +35,92 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Maestro.Login, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Login.dll</HintPath>
+ <HintPath>..\SDK\bin\Aga.Controls.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Ciloci.Flee, Version=0.9.26.0, Culture=neutral, PublicKeyToken=c8526a021ef298ed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <HintPath>..\SDK\bin\Ciloci.Flee.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI.Http, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.Http.dll</HintPath>
+ <HintPath>..\SDK\bin\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI.Native, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.Native.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
</Reference>
+ <Reference Include="Maestro.Login, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\Maestro.Login.dll</HintPath>
+ </Reference>
+ <Reference Include="Maestro.Packaging, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\Maestro.Packaging.dll</HintPath>
+ </Reference>
+ <Reference Include="Maestro.Shared.UI, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\Maestro.Shared.UI.dll</HintPath>
+ </Reference>
+ <Reference Include="MapGuideDotNetApi, Version=2.0.0.2308, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\MapGuideDotNetApi.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.MaestroAPI.Http, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.Http.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.MaestroAPI.Native, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.Native.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.dll</HintPath>
+ </Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
+ <Reference Include="Topology, Version=1.0.8.24721, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\Topology.dll</HintPath>
+ </Reference>
+ <Reference Include="Topology.IO.MapGuide, Version=1.0.8.40022, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\SDK\bin\Topology.IO.MapGuide.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Properties\GlobalAssemblyInfo.cs">
Modified: sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -33,45 +33,55 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Maestro.Editors, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Editors.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="Maestro.Shared.UI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Shared.UI, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Shared.UI.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Shared.UI.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.2.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.3.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.LoadProcedure-2.2.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
- <Reference Include="OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs 2011-02-18 13:05:10 UTC (rev 5559)
@@ -28,7 +28,6 @@
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using Maestro.Shared.UI;
using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels;
namespace Maestro.AddIn.ExtendedObjectModels.Templates
{
Modified: sandbox/maestro-3.0/Maestro.Base/Commands/CutCommand.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Commands/CutCommand.cs 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Base/Commands/CutCommand.cs 2011-02-18 13:05:10 UTC (rev 5559)
@@ -50,7 +50,7 @@
}
}
- private static void ResetClipboardedItems(ClipboardService clip, OpenResourceManager omgr)
+ private new static void ResetClipboardedItems(ClipboardService clip, OpenResourceManager omgr)
{
//Reset state of clipboarded items
if (clip.HasContent())
Modified: sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -43,17 +43,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Release\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="Maestro.Packaging, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Packaging, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Packaging.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Packaging.dll</HintPath>
</Reference>
<Reference Include="Maestro.Shared.UI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SDK\bin\Release\Maestro.Shared.UI.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs 2011-02-18 13:05:10 UTC (rev 5559)
@@ -301,7 +301,7 @@
private bool _open = false;
private bool _dirty = false;
- private bool _clipboarded = false;
+ //private bool _clipboarded = false;
internal bool IsOpen
{
Modified: sandbox/maestro-3.0/Maestro.Base/Workbench.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Workbench.cs 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Base/Workbench.cs 2011-02-18 13:05:10 UTC (rev 5559)
@@ -333,7 +333,6 @@
throw new NotImplementedException();
case ViewRegion.Dialog:
throw new NotImplementedException();
- break;
}
}
Modified: sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,11 +25,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\SDK\bin\Release\Maestro.Editors.XML</DocumentationFile>
+ <DocumentationFile>..\SDK\bin\Maestro.Editors.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
Modified: sandbox/maestro-3.0/Maestro.Login/Maestro.Login.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Login/Maestro.Login.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Login/Maestro.Login.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,11 +25,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\SDK\bin\Release\Maestro.Login.XML</DocumentationFile>
+ <DocumentationFile>..\SDK\bin\Maestro.Login.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: sandbox/maestro-3.0/Maestro.Packaging/Maestro.Packaging.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Packaging/Maestro.Packaging.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Packaging/Maestro.Packaging.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -19,7 +19,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -27,11 +27,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\SDK\bin\Release\Maestro.Packaging.XML</DocumentationFile>
+ <DocumentationFile>..\SDK\bin\Maestro.Packaging.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
Modified: sandbox/maestro-3.0/Maestro.Shared.UI/Maestro.Shared.UI.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,11 +25,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\SDK\bin\Release\Maestro.Shared.UI.XML</DocumentationFile>
+ <DocumentationFile>..\SDK\bin\Maestro.Shared.UI.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: sandbox/maestro-3.0/MaestroFsPreview/MaestroFsPreview.csproj
===================================================================
--- sandbox/maestro-3.0/MaestroFsPreview/MaestroFsPreview.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/MaestroFsPreview/MaestroFsPreview.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -39,21 +39,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Thirdparty\TreeViewAdv\Aga.Controls\obj\Debug\Aga.Controls.dll</HintPath>
</Reference>
- <Reference Include="Maestro.Editors, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Editors, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Editors.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Editors.dll</HintPath>
</Reference>
- <Reference Include="Maestro.Login, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Login, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Login.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Login.dll</HintPath>
</Reference>
<Reference Include="Maestro.Shared.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Maestro.Shared.UI\bin\Debug\Maestro.Shared.UI.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: sandbox/maestro-3.0/MgCooker/MgCooker.csproj
===================================================================
--- sandbox/maestro-3.0/MgCooker/MgCooker.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/MgCooker/MgCooker.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -32,13 +32,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Maestro.Login, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Maestro.Login, Version=3.0.0.5475, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\Maestro.Login.dll</HintPath>
+ <HintPath>..\SDK\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5334, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
+ <HintPath>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;DEBUG;LDF_100, WL_100, MDF_100, SYM_100, LP_100</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,11 +28,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE;LDF_100, WL_100, MDF_100, SYM_100, LP_100</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>..\SDK\bin\Release\OSGeo.MapGuide.MaestroAPI.XML</DocumentationFile>
+ <DocumentationFile>..\SDK\bin\OSGeo.MapGuide.MaestroAPI.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ciloci.Flee, Version=0.9.26.0, Culture=neutral, PublicKeyToken=c8526a021ef298ed, processorArchitecture=MSIL">
Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs 2011-02-18 13:05:10 UTC (rev 5559)
@@ -31,6 +31,16 @@
this.Description = description;
}
+ public int DefaultImageXSize { get; set; }
+
+ public int DefaultImageYSize { get; set; }
+
+ public bool IsNullable { get; set; }
+
+ public bool IsReadOnly { get; set; }
+
+ public string SpatialContextAssociation { get; set; }
+
public override PropertyDefinitionType Type
{
get { return PropertyDefinitionType.Raster; }
@@ -38,12 +48,31 @@
public override void WriteXml(System.Xml.XmlDocument doc, System.Xml.XmlNode currentNode)
{
- throw new NotImplementedException();
+ var geom = doc.CreateElement("xs", "element", XmlNamespaces.XS);
+ geom.SetAttribute("name", this.Name); //TODO: This may have been decoded. Should it be re-encoded?
+ geom.SetAttribute("type", "fdo:RasterPropertyType");
+ geom.SetAttribute("defaultImageXSize", XmlNamespaces.FDO, this.DefaultImageXSize.ToString());
+ geom.SetAttribute("defaultImageYSize", XmlNamespaces.FDO, this.DefaultImageYSize.ToString());
+ geom.SetAttribute("srsName", XmlNamespaces.FDO, this.SpatialContextAssociation);
+
+ currentNode.AppendChild(geom);
}
public override void ReadXml(System.Xml.XmlNode node, System.Xml.XmlNamespaceManager mgr)
{
- throw new NotImplementedException();
+ var dix = node.Attributes["fdo:defaultImageXSize"];
+ var diy = node.Attributes["fdo:defaultImageYSize"];
+ var srs = node.Attributes["fdo:srsName"];
+
+ this.DefaultImageXSize = Convert.ToInt32(dix.Value);
+ this.DefaultImageYSize = Convert.ToInt32(diy.Value);
+
+ //TODO: Just copypasta'd from DataPropertyDefinition assuming the same attributes would be used
+ //to indicate nullability and read-only states. Would be nice to verify with an actual example property
+ this.IsNullable = (node.Attributes["minOccurs"] != null && node.Attributes["minOccurs"].Value == "0");
+ this.IsReadOnly = (node.Attributes["fdo:readOnly"] != null && node.Attributes["fdo:readOnly"].Value == "true");
+
+ this.SpatialContextAssociation = (srs != null ? srs.Value : string.Empty);
}
}
}
Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native.csproj 2011-02-18 13:05:10 UTC (rev 5559)
@@ -20,7 +20,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\SDK\bin\Debug\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\SDK\bin\Release\</OutputPath>
+ <OutputPath>..\SDK\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Modified: sandbox/maestro-3.0/build.bat
===================================================================
--- sandbox/maestro-3.0/build.bat 2011-02-18 10:45:07 UTC (rev 5558)
+++ sandbox/maestro-3.0/build.bat 2011-02-18 13:05:10 UTC (rev 5559)
@@ -85,10 +85,12 @@
:clean
pushd SDK
%MSBUILD% /t:clean SDK.sln
+rd /S /Q bin
popd
pushd Maestro
%MSBUILD% /t:clean Maestro.sln
popd
+rd /S /Q out
goto quit
:custom_error
More information about the mapguide-commits
mailing list