From 4e75c45fd9ea3a3c736e01c2f13113e09fbb7a41 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Tue, 13 Dec 2016 20:52:30 +0000
Subject: [PATCH] SEARCH-207, revert changes introduced in commit 133606

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../subsystems/Search/solr4/solr-search-context.xml       | 1 -
 .../subsystems/Search/solr4/solr-search.properties        | 1 -
 .../subsystems/Search/solr6/solr-search-context.xml       | 1 -
 .../subsystems/Search/solr6/solr-search.properties        | 1 -
 .../alfresco/repo/search/impl/solr/SolrStoreMapping.java  | 8 --------
 5 files changed, 12 deletions(-)

diff --git a/config/alfresco/subsystems/Search/solr4/solr-search-context.xml b/config/alfresco/subsystems/Search/solr4/solr-search-context.xml
index 6b363a4f96..cb63cd2bb8 100644
--- a/config/alfresco/subsystems/Search/solr4/solr-search-context.xml
+++ b/config/alfresco/subsystems/Search/solr4/solr-search-context.xml
@@ -70,7 +70,6 @@
         <property name="defaultUnshardedFacetLimit" value="${solr.defaultUnshardedFacetLimit}"/>
         <property name="defaultShardedFacetLimit" value="${solr.defaultShardedFacetLimit}"/>
         <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
-        <property name="secureComms" value="${solr.secureComms}"/>
     </bean>
     
     
diff --git a/config/alfresco/subsystems/Search/solr4/solr-search.properties b/config/alfresco/subsystems/Search/solr4/solr-search.properties
index 96e43029b0..871cc459a0 100644
--- a/config/alfresco/subsystems/Search/solr4/solr-search.properties
+++ b/config/alfresco/subsystems/Search/solr4/solr-search.properties
@@ -9,7 +9,6 @@ solr.defaultUnshardedFacetLimit=100
 solr.defaultShardedFacetLimit=20
 
 solr.useDynamicShardRegistration=false
-solr.secureComms=none
 
 #
 # Solr Suggester properties
diff --git a/config/alfresco/subsystems/Search/solr6/solr-search-context.xml b/config/alfresco/subsystems/Search/solr6/solr-search-context.xml
index 1f3f950e42..5103cfe755 100644
--- a/config/alfresco/subsystems/Search/solr6/solr-search-context.xml
+++ b/config/alfresco/subsystems/Search/solr6/solr-search-context.xml
@@ -70,7 +70,6 @@
         <property name="defaultUnshardedFacetLimit" value="${solr.defaultUnshardedFacetLimit}"/>
         <property name="defaultShardedFacetLimit" value="${solr.defaultShardedFacetLimit}"/>
         <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
-        <property name="secureComms" value="${solr.secureComms}"/>
     </bean>
     
     
diff --git a/config/alfresco/subsystems/Search/solr6/solr-search.properties b/config/alfresco/subsystems/Search/solr6/solr-search.properties
index 42acc46b47..d85ef4295c 100644
--- a/config/alfresco/subsystems/Search/solr6/solr-search.properties
+++ b/config/alfresco/subsystems/Search/solr6/solr-search.properties
@@ -9,7 +9,6 @@ solr.defaultUnshardedFacetLimit=100
 solr.defaultShardedFacetLimit=20
 
 solr.useDynamicShardRegistration=false
-solr.secureComms=none
 
 #
 # Solr Suggester properties
diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java b/source/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
index e12db41ce1..56293886f7 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrStoreMapping.java
@@ -53,8 +53,6 @@ public class SolrStoreMapping implements BeanNameAware
     private int numShards = 1;
 
     private int replicationFactor = 1;
-    
-    private String secureComms;
     
     public SolrStoreMapping()
     {
@@ -250,10 +248,4 @@ public class SolrStoreMapping implements BeanNameAware
     {
         this.replicationFactor = replicationFactor;
     }
-
-    public void setSecureComms(String secureComms)
-    {
-        this.secureComms = secureComms;
-    }
-
 }