shopizer-uncached

diff --git a/pom.xml b/pom.xml
index 0ef5e13..bb119f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,14 @@
 		    <artifactId>ehcache</artifactId>
 		</dependency>
 		
+		<!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
+		<dependency>
+		    <groupId>com.mchange</groupId>
+		    <artifactId>c3p0</artifactId>
+		    <version>0.9.5.2</version>
+		</dependency>
+		
+		
     </dependencies>
 
 	<modules>

diff --git a/shopizer-canadapost/pom.xml b/shopizer-canadapost/pom.xml
index d567bb3..dc8b176 100644
--- a/shopizer-canadapost/pom.xml
+++ b/shopizer-canadapost/pom.xml
@@ -21,8 +21,8 @@
 		<org.springframework-version>4.2.1.RELEASE</org.springframework-version>
 		<junit.version>4.9</junit.version>
 		<org.aspectj-version>1.6.10</org.aspectj-version>
-		<org.slf4j-version>1.6.6</org.slf4j-version>
-
+		<org.slf4j-version>1.7.21</org.slf4j-version>
+        <log4j-version>1.2.17</log4j-version>
 		
 	</properties>
 	
@@ -77,7 +77,7 @@
 			<version>${org.aspectj-version}</version>
 		</dependency>	
 		
-		<!-- Logging -->
+<!-- 		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -100,6 +100,21 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.16</version>
 			<scope>compile</scope>
+		</dependency> -->
+		
+		<!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
+ 		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>log4j-over-slf4j</artifactId>
+		    <version>${org.slf4j-version}</version>
+		</dependency>
+
+		
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j-version}</version>
+			<!--<scope>compile</scope>-->
 		</dependency>
 
 		<!-- @Inject -->

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 95f5cf2..50fa5d0 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 01 09:22:10 EDT 2016
+#Tue Nov 01 12:30:39 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/pom.xml b/shopizer-shipping-distance-module/pom.xml
index 9e66765..ea7a168 100644
--- a/shopizer-shipping-distance-module/pom.xml
+++ b/shopizer-shipping-distance-module/pom.xml
@@ -22,7 +22,8 @@
 		<org.springframework-version>4.2.1.RELEASE</org.springframework-version>
 		<junit.version>4.9</junit.version>
 		<org.aspectj-version>1.6.10</org.aspectj-version>
-		<org.slf4j-version>1.6.6</org.slf4j-version>
+		<org.slf4j-version>1.7.21</org.slf4j-version>
+		<log4j-version>1.2.17</log4j-version>
 		<sm-core.drools.version>5.6.0.Final</sm-core.drools.version>
 		<google-client-maps-services-version>0.1.6</google-client-maps-services-version>
 		
@@ -82,7 +83,7 @@
 		</dependency>	
 		
 		<!-- Logging -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${org.slf4j-version}</version>
@@ -104,7 +105,21 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.16</version>
 			<scope>compile</scope>
+		</dependency> -->
+		
+		<!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>log4j-over-slf4j</artifactId>
+		    <version>${org.slf4j-version}</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j-version}</version>
+			<scope>compile</scope>
+		</dependency>		
 
 		<!-- @Inject -->
 		<dependency>

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index d0bad99..e6c5da9 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 01 09:22:09 EDT 2016
+#Tue Nov 01 12:30:38 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-search/pom.xml b/sm-search/pom.xml
index ec539a2..fe57587 100644
--- a/sm-search/pom.xml
+++ b/sm-search/pom.xml
@@ -87,7 +87,7 @@
 		</dependency>	
 		
 		<!-- Logging -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${org.slf4j-version}</version>
@@ -103,9 +103,16 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>${org.slf4j-version}</version>
 			<scope>runtime</scope>
-		</dependency>
+		</dependency> -->
 		
+	    <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
 		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>log4j-over-slf4j</artifactId>
+		    <version>${org.slf4j-version}</version>
+		</dependency>
+		
+	   <dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>${log4j-version}</version>

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index f71f9e4..b3cf73f 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 01 09:22:10 EDT 2016
+#Tue Nov 01 12:00:24 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
index ec539a2..fe57587 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
@@ -87,7 +87,7 @@
 		</dependency>	
 		
 		<!-- Logging -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>${org.slf4j-version}</version>
@@ -103,9 +103,16 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>${org.slf4j-version}</version>
 			<scope>runtime</scope>
-		</dependency>
+		</dependency> -->
 		
+	    <!-- https://mvnrepository.com/artifact/org.slf4j/log4j-over-slf4j -->
 		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>log4j-over-slf4j</artifactId>
+		    <version>${org.slf4j-version}</version>
+		</dependency>
+		
+	   <dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>${log4j-version}</version>

diff --git a/sm-shop/.settings/org.eclipse.wst.validation.prefs b/sm-shop/.settings/org.eclipse.wst.validation.prefs
index 6f1cba6..95e1df8 100644
--- a/sm-shop/.settings/org.eclipse.wst.validation.prefs
+++ b/sm-shop/.settings/org.eclipse.wst.validation.prefs
@@ -1,2 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationtrueversion1.2.700.v201508251749
 disabled=06target
 eclipse.preferences.version=1
+override=true
+suspend=true
+vf.version=3

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java
new file mode 100644
index 0000000..93ad427
--- /dev/null
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplication.java
@@ -0,0 +1,15 @@
+package com.salesmanager.shop.application;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan("com.salesmanager.shop.*")
+public class ShopApplication {
+	
+    public static void main(String[] args) {
+        SpringApplication.run(ShopApplication.class, args);
+    }
+
+}

diff --git a/sm-shop/src/main/resources/spring/shopizer-properties.xml b/sm-shop/src/main/resources/spring/shopizer-properties.xml
index 4fd2d1d..7926fed 100644
--- a/sm-shop/src/main/resources/spring/shopizer-properties.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-properties.xml
@@ -61,7 +61,7 @@
 		<value>exoticamobilia</value>
     </util:list>
     
-    <bean id="initData" class="com.salesmanager.web.init.data.InitStoreData"/>
+    <bean id="initData" class="com.salesmanager.shop.init.data.InitStoreData"/>
 
 	
  

diff --git a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
index 63df941..876ce65 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -84,8 +84,7 @@
   	</beans:bean>
 
 	
-	<beans:bean id="messages" class="com.salesmanager.shop.utils.LabelUtils">
-	</beans:bean>
+	<beans:bean id="messages" class="com.salesmanager.shop.utils.LabelUtils"/>
 	
 	<!-- load images from local web server [com.salesmanager.web.utils.LocalImageFilePathUtils] -->
 	<beans:bean id="img" class="com.salesmanager.shop.utils.LocalImageFilePathUtils">
@@ -94,6 +93,4 @@
 	</beans:bean>
 	
 
-	<beans:import resource="controllers.xml" />
-	
 </beans:beans>
\ No newline at end of file

diff --git a/sm-shop/src/main/webapp/WEB-INF/web.xml b/sm-shop/src/main/webapp/WEB-INF/web.xml
index ec5ed72..f415acd 100644
--- a/sm-shop/src/main/webapp/WEB-INF/web.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-  <context-param>
+<!--   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
 			classpath:spring/spring-context.xml
@@ -16,8 +16,8 @@
     <listener-class>
         org.springframework.web.context.request.RequestContextListener
     </listener-class>
-  </listener>
-  <servlet>
+  </listener -->
+  <!--   <servlet>
     <servlet-name>appServlet</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <init-param>
@@ -29,7 +29,7 @@
 			</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
-  </servlet>
+  </servlet> -->
   
   <servlet-mapping>
     <servlet-name>appServlet</servlet-name>

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class
index 78fda20..8f1d36d 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class
index 80b4d9a..e812413 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class
index 2750625..603320f 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class
index 153010d..f3be656 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class
index 75db926..3b97392 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class differ

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 3b9a5e3..dad2a1d 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Nov 01 10:41:25 EDT 2016
+#Tue Nov 01 12:06:43 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop