ready for 1.3.0

Signed-off-by: Emmanuel Mathot <[email protected]>

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Terradue.OpenSearch"]
-	path = Terradue.OpenSearch
-	url = git://github.com/Terradue/DotNetOpenSearch

Terradue.OpenSearch.Client.nuspec

@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package >
   <metadata>
-    <id>OpenSearchClient</id>
-    <version>1.2</version>
+    <id>Terradue.OpenSearch.Client</id>
+    <version>1.3.0</version>
     <authors>Terradue</authors>
     <owners>Terradue</owners>
-    <licenseUrl>https://www.gnu.org/copyleft/gpl.html</licenseUrl>
-    <projectUrl>https://github.com/Terradue/OpenSearchClient</projectUrl>
+    <licenseUrl>https://github.com/Terradue/DotNetOpenSearchClient/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/Terradue/DotNetOpenSearchClient</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Package description</description>
-    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+    <description>Generic OpenSearch Client</description>
     <copyright>Copyright 2014</copyright>
     <tags>OpenSearch</tags>
     <dependencies>
-      <dependency id="Terradue.OpenSearch" version="1.5.0.0" />
-      <dependency id="Terradue.GeoJson" version="1.3.2.0" />
-      <dependency id="Terradue.Metadata" version="1.3.1" />
-      <dependency id="Terradue.Util" version="1.3.1" />
-      <dependency id="Terradue.OpenSearch.GeoJson" version="1.0.0" />
-      <dependency id="ServiceStack.Text" version="3.9.71" />
+      <dependency id="Terradue.ServiceModel.Syndication" version="1.0.0" />
+      <dependency id="Terradue.OpenSearch" version="[1.7.0,1.8)" />
+      <dependency id="Terradue.GeoJson" version="[1.4.0,1.5)" />
+      <dependency id="ServiceStack.Text" version="[3.9.71,4)" />
       <dependency id="log4net" version="[2.0.0]" />
+      <dependency id="Mono.Addins" version="[1.1]" />
     </dependencies>
-	<frameworkAssemblies>
-	  <frameworkAssembly assemblyName="Mono.Addins"  />
-	</frameworkAssemblies>
   </metadata>
   <files>
-	  <file src="bin/OpenSearchClient.*" target="lib/net40" /> 
+	  <file src="Terradue.OpenSearch.Client/bin/OpenSearchClient.exe" target="lib/net40" /> 
   </files>
 </package>

Terradue.OpenSearch.Client.sln

@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terradue.OpenSearch", "Terradue.OpenSearch\Terradue.OpenSearch\Terradue.OpenSearch.csproj", "{997A44FD-EE4A-490A-855B-88305E0CD269}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Terradue.OpenSearch.Client", "Terradue.OpenSearch.Client\Terradue.OpenSearch.Client.csproj", "{1FB59AA7-3878-47CD-4267-F179F56C6470}"
 EndProject
 Global
@@ -15,10 +13,6 @@ Global
 		{1FB59AA7-3878-47CD-4267-F179F56C6470}.Debug|x86.Build.0 = Debug|x86
 		{1FB59AA7-3878-47CD-4267-F179F56C6470}.Release|x86.ActiveCfg = Release|x86
 		{1FB59AA7-3878-47CD-4267-F179F56C6470}.Release|x86.Build.0 = Release|x86
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Debug|x86.Build.0 = Debug|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Release|x86.ActiveCfg = Release|Any CPU
-		{997A44FD-EE4A-490A-855B-88305E0CD269}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Terradue.OpenSearch.Client\Terradue.OpenSearch.Client.csproj

Terradue.OpenSearch.Client/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 [assembly: AssemblyTitle("OpenSearchClient")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Generic OpenSearch Client")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("")]
@@ -14,8 +14,8 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.2.*")]
-[assembly: AssemblyInformationalVersion("1.2")]
+[assembly: AssemblyVersion("1.3.0.*")]
+[assembly: AssemblyInformationalVersion("1.3.0")]
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]

Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj

@@ -22,7 +22,7 @@
     <Externalconsole>true</Externalconsole>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
-    <Commandlineparameters>-f Rdf -p time:start=1995-10-11T14:54:10.000Z -p time:end=1995-10-11T14:55:12.000Z -p eop:wrsLongitudeGrid=125 -p time:relation=equals http://cci-ice-velocity.terradue.int/catalogue/search/ICESHEET_CCI_SLC/description</Commandlineparameters>
+    <Commandlineparameters>-f rdf -p time:start=1995-10-11T14:54:10.000Z -p time:end=1996-10-11T14:55:12.000Z -p eop:wrsLongitudeGrid=125 http://cci-ice-velocity.terradue.int/catalogue/search/ICESHEET_CCI_SLC/description enclosure</Commandlineparameters>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>full</DebugType>
@@ -47,20 +47,29 @@
     <Reference Include="Mono.Addins">
       <HintPath>..\packages\Mono.Addins.1.1\lib\Mono.Addins.dll</HintPath>
     </Reference>
+    <Reference Include="Terradue.ServiceModel.Syndication">
+      <HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.0.0\lib\net40\Terradue.ServiceModel.Syndication.dll</HintPath>
+    </Reference>
+    <Reference Include="Terradue.OpenSearch">
+      <HintPath>..\packages\Terradue.OpenSearch.1.7.0.1\lib\net40\Terradue.OpenSearch.dll</HintPath>
+    </Reference>
+    <Reference Include="Terradue.GeoJson">
+      <HintPath>..\packages\Terradue.GeoJson.1.4.0\lib\net40\Terradue.GeoJson.dll</HintPath>
+    </Reference>
+    <Reference Include="Terradue.OpenSearch.RdfEO">
+      <HintPath>..\packages\Terradue.OpenSearch.RdfEO.1.0.1\lib\net40\Terradue.OpenSearch.RdfEO.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks" />
   <ItemGroup>
-    <Compile Include="Terradue\Air\OpenSearchClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Terradue\OpenSearch\Client\OpenSearchClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Terradue.OpenSearch\Terradue.OpenSearch\Terradue.OpenSearch.csproj">
-      <Project>{997A44FD-EE4A-490A-855B-88305E0CD269}</Project>
-      <Name>Terradue.OpenSearch</Name>
-    </ProjectReference>
+    <Folder Include="Terradue\OpenSearch\" />
+    <Folder Include="Terradue\OpenSearch\Client\" />
   </ItemGroup>
 </Project>