Updated elastic search references.

IsraelHikingMap · Aug 25, 2016 · d1efb2d · d1efb2d
1 parent d7bc6c7
commit d1efb2d
Show file tree

Hide file tree

Showing 37 changed files with 21 additions and 24 deletions.
diff --git a/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs b/IsraelHiking.DataAccess/ElasticSearch/ElasticSearchHelper.cs
@@ -7,7 +7,7 @@ public class ElasticSearchHelper : BaseNssmHelper
         protected override string RelativePath => "ElasticSearch";
         protected override string Name => "\"Elastic Search Service\"";
         protected override string Description => "Name search service for israel hiking site";
-        protected override string CommandLine => "java -Delasticsearch -Des-foreground=yes -Des.path.home=\"./ \" -cp \"lib/elasticsearch-2.2.1.jar;lib/*\" \"org.elasticsearch.bootstrap.Elasticsearch\" start";
+        protected override string CommandLine => "java -Delasticsearch -Des-foreground=yes -Des.path.home=\"./ \" -cp \"lib/elasticsearch-2.3.5.jar;lib/*\" \"org.elasticsearch.bootstrap.Elasticsearch\" start";
 
         public ElasticSearchHelper(ILogger logger, IProcessHelper processHelper) : base(logger, processHelper)
         {

diff --git a/...ElasticSearch/lib/elasticsearch-2.2.1.jar → ...ElasticSearch/lib/elasticsearch-2.3.5.jar b/...ElasticSearch/lib/elasticsearch-2.2.1.jar → ...ElasticSearch/lib/elasticsearch-2.3.5.jar
diff --git a/.../ElasticSearch/lib/jackson-core-2.6.2.jar → .../ElasticSearch/lib/jackson-core-2.6.6.jar b/.../ElasticSearch/lib/jackson-core-2.6.2.jar → .../ElasticSearch/lib/jackson-core-2.6.6.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.2.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.6.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-cbor-2.6.6.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.2.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.2.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.6.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/jackson-dataformat-smile-2.6.6.jar
diff --git a/...rch/lib/jackson-dataformat-yaml-2.6.2.jar → ...rch/lib/jackson-dataformat-yaml-2.6.6.jar b/...rch/lib/jackson-dataformat-yaml-2.6.2.jar → ...rch/lib/jackson-dataformat-yaml-2.6.6.jar
diff --git a/...ess/ElasticSearch/lib/joda-time-2.8.2.jar → ...ess/ElasticSearch/lib/joda-time-2.9.4.jar b/...ess/ElasticSearch/lib/joda-time-2.8.2.jar → ...ess/ElasticSearch/lib/joda-time-2.9.4.jar
diff --git a/...rch/lib/lucene-analyzers-common-5.4.1.jar → ...rch/lib/lucene-analyzers-common-5.5.0.jar b/...rch/lib/lucene-analyzers-common-5.4.1.jar → ...rch/lib/lucene-analyzers-common-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-backward-codecs-5.5.0.jar
diff --git a/...s/ElasticSearch/lib/lucene-core-5.4.1.jar → ...s/ElasticSearch/lib/lucene-core-5.5.0.jar b/...s/ElasticSearch/lib/lucene-core-5.4.1.jar → ...s/ElasticSearch/lib/lucene-core-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-grouping-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-highlighter-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-join-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-memory-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-misc-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queries-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-queryparser-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-sandbox-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-spatial3d-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.4.1.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.4.1.jar
diff --git a/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.5.0.jar b/IsraelHiking.DataAccess/ElasticSearch/lib/lucene-suggest-5.5.0.jar
diff --git a/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj b/IsraelHiking.DataAccess/IsraelHiking.DataAccess.csproj
@@ -243,7 +243,7 @@
     <Content Include="ElasticSearch\lib\compress-lzf-1.0.2.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\elasticsearch-2.2.1.jar">
+    <Content Include="ElasticSearch\lib\elasticsearch-2.3.5.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ElasticSearch\lib\guava-18.0.jar">
@@ -255,16 +255,16 @@
     <Content Include="ElasticSearch\lib\hppc-0.7.1.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\jackson-core-2.6.2.jar">
+    <Content Include="ElasticSearch\lib\jackson-core-2.6.6.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\jackson-dataformat-cbor-2.6.2.jar">
+    <Content Include="ElasticSearch\lib\jackson-dataformat-cbor-2.6.6.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\jackson-dataformat-smile-2.6.2.jar">
+    <Content Include="ElasticSearch\lib\jackson-dataformat-smile-2.6.6.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\jackson-dataformat-yaml-2.6.2.jar">
+    <Content Include="ElasticSearch\lib\jackson-dataformat-yaml-2.6.6.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ElasticSearch\lib\jna-4.1.0.jar">
@@ -273,7 +273,7 @@
     <Content Include="ElasticSearch\lib\joda-convert-1.2.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\joda-time-2.8.2.jar">
+    <Content Include="ElasticSearch\lib\joda-time-2.9.4.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ElasticSearch\lib\jsr166e-1.1.0.jar">
@@ -285,46 +285,46 @@
     <Content Include="ElasticSearch\lib\log4j-1.2.17.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-analyzers-common-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-analyzers-common-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-backward-codecs-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-backward-codecs-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-core-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-core-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-grouping-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-grouping-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-highlighter-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-highlighter-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-join-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-join-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-memory-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-memory-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-misc-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-misc-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-queries-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-queries-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-queryparser-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-queryparser-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-sandbox-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-sandbox-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-spatial-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-spatial-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-spatial3d-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-spatial3d-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ElasticSearch\lib\lucene-suggest-5.4.1.jar">
+    <Content Include="ElasticSearch\lib\lucene-suggest-5.5.0.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ElasticSearch\lib\netty-3.10.5.Final.jar">

diff --git a/IsrealHiking.Web/OSM2012.pubxml b/IsrealHiking.Web/OSM2012.pubxml
@@ -31,7 +31,4 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     </PublishDatabaseSettings>
     <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
   </PropertyGroup>
-  <ItemGroup>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)IsraelHikingDbContext-Web.config Connection String" />
-  </ItemGroup>
 </Project>