More config changes

sandeeptaz · Mar 14, 2016 · 69b0cc8 · 69b0cc8
1 parent 927e1f3
commit 69b0cc8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/sm-core/src/main/resources/cms/infinispan_configuration.xml b/sm-core/src/main/resources/cms/infinispan_configuration.xml
@@ -3,7 +3,7 @@
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" xmlns="urn:infinispan:config:5.3">
 
 	<global>
-
+		
 		 <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
 
 	</global>
@@ -54,8 +54,8 @@
 			  <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false"
 	               ignoreModifications="false" purgeOnStartup="false">
 	               <properties>
-	                 <!--<property name="location" value="./infinispan/store"/>-->
-	                 <property name="location" value="/Users/carlsamson/Documents/dev/cache_data/infinispan/store"/>
+	                 <property name="location" value="./infinispan/store"/>
+	                 <!-- <property name="location" value="${infinispan.cache.file.location}"/> -->
 	               </properties>
 	          </loader>
 
@@ -77,8 +77,8 @@
 	          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false"
 	               ignoreModifications="false" purgeOnStartup="false">
 	            <properties>
-	                 <!--<property name="location" value="./infinispan/files"/>-->
-	                 <property name="location" value="/Users/carlsamson/Documents/dev/cache_data/infinispan/files"/>
+	                 <property name="location" value="./infinispan/files"/>
+	                <!--  <property name="location" value="${infinispan.cache.file.location}"/> -->
 	               </properties>
 	          </loader>
 	     </loaders>

diff --git a/sm-core/src/main/resources/configs.properties b/sm-core/src/main/resources/configs.properties
@@ -1,2 +1,16 @@
 #Must be 16 digits (replace with your own creation !)
-secretKey=7070200000000007
+secretKey=7070200000000007
+
+#Elastic Search configurations
+elastic.search.mode.cluster.name=shopizer
+elastic.search.mode=remote
+elastic.search.cluster.host=http://localhost
+elastic.search.cluster.port =9200
+elastic.search.cluster.proxy.user=
+elastic.search.cluster.proxy.password=
+# elastic search configuration
+
+
+# Infinispan Configuration
+
+infinispan.cache.file.location=/home/umeshawasthi/personal/infinispan
diff --git a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
@@ -9,11 +9,11 @@
 
 		<!-- Shipping pre-processors -->
 		<util:list id="shippingModulePreProcessors" value-type="com.salesmanager.core.modules.integration.shipping.model.ShippingQuotePreProcessModule">
-			<ref bean="shippingDistancePreProcessor"/>
+		<!-- 	<ref bean="shippingDistancePreProcessor"/> -->
 			<!-- From rules -->
-			<!--
+
 			<ref bean="shippingMethodDecisionProcess"/>
-			-->
+
 		</util:list>
 
 

diff --git a/sm-core/src/main/resources/spring/shopizer-search.xml b/sm-core/src/main/resources/spring/shopizer-search.xml
@@ -13,15 +13,15 @@
 
 	<!-- Server configuration -->
 	<bean id="serverConfiguration" class="com.shopizer.search.utils.ServerConfiguration">
-		<property name="clusterName" value="shopizer"/>
+		<property name="clusterName" value="${elastic.search.mode.cluster.name}"/>
 		<!-- local (embedded version, will create new indexes in the working directory) or remote (requires existing server) -->
-		<property name="mode" value="remote"/>
+		<property name="mode" value="${elastic.search.mode}"/>
 		<!-- http interface to ES server -->
-		<property name="clusterHost" value="http://localhost"/>
-		<property name="clusterPort" value="9200"/>
+		<property name="clusterHost" value="${elastic.search.cluster.host}"/>
+		<property name="clusterPort" value="${elastic.search.cluster.port}"/>
 
-		<property name="proxyUser" value=""/>
-		<property name="proxyPassword" value=""/>
+		<property name="proxyUser" value="${elastic.search.cluster.port}"/>
+		<property name="proxyPassword" value="${elastic.search.cluster.proxy.password}"/>
 	</bean>