shopizer-uncached

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..8ab0272
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="shopizer-canadapost/src/main/java"/>
+	<classpathentry kind="src" path="shopizer-canadapost/src/test/java"/>
+	<classpathentry kind="src" path="shopizer-shipping-distance-module/src/main/java"/>
+	<classpathentry kind="src" path="shopizer-shipping-distance-module/src/test/java"/>
+	<classpathentry kind="src" path="sm-core/src/main/java"/>
+	<classpathentry kind="src" path="sm-core/src/test/java"/>
+	<classpathentry kind="src" path="sm-core-model/src/main/java"/>
+	<classpathentry kind="src" path="sm-core-modules/src/main/java"/>
+	<classpathentry kind="src" path="sm-search/src/main/java"/>
+	<classpathentry kind="src" path="sm-search/src/test/java"/>
+	<classpathentry kind="src" path="sm-shop/src/main/java"/>
+	<classpathentry kind="src" path="sm-shop/src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/.gitignore b/.gitignore
index 80e12bd..d13ffee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 */target/*
 .idea/workspace.xml
 *.class
+/bin/
+/WebContent/

diff --git a/.project b/.project
index 9ece14e..beffb59 100644
--- a/.project
+++ b/.project
@@ -6,12 +6,32 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>

diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..92e666d
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..99f4a85
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="shopizer">
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/shopizer-canadapost/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/shopizer-canadapost/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/shopizer-shipping-distance-module/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/shopizer-shipping-distance-module/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-core/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-core/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-core-model/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-core-modules/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-search/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-search/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-shop/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/sm-shop/src/test/java"/>
+        <property name="context-root" value="shopizer"/>
+        <property name="java-output-path" value="/shopizer/bin"/>
+    </wb-module>
+</project-modules>

diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..f90e275
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v7.0"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file

diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 38644be..ec98689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,7 @@
         <shopizer-canadapost.version>2.5.0-SNAPSHOT</shopizer-canadapost.version>
 		<shopizer-shipping-distance.version>2.5.0-SNAPSHOT</shopizer-shipping-distance.version>	
         <jackson-version>2.7.4</jackson-version>
-        
-        <spring-mobile-device-version>1.1.4.RELEASE</spring-mobile-device-version>
+
         <commons-collections4.version>4.0</commons-collections4.version>
         <commons-validator.version>1.5.1</commons-validator.version>
         <org.apache.httpcomponent.version>4.5.2</org.apache.httpcomponent.version>

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 b785316..8db2e08 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
-#Fri Nov 11 10:11:04 EST 2016
+#Mon Nov 14 10:53:54 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

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 3d9ad9a..cc84cfe 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
-#Fri Nov 11 10:11:03 EST 2016
+#Mon Nov 14 10:53:54 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/.classpath b/sm-core/.classpath
index fc5f96c..b130f32 100644
--- a/sm-core/.classpath
+++ b/sm-core/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
index be9e68b..bd8cea2 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
@@ -14,7 +14,7 @@ public interface GroupRepository extends JpaRepository<Group, Integer> {
 
 	Group findById(Long id);
 	
-	@Query("select g from Group as g join fetch g.permissions perms order by g.id")
+	@Query("select distinct g from Group as g join fetch g.permissions perms order by g.id")
 	List<Group> findAll();
 	
 	@Query("select g from Group as g join fetch g.permissions perms where perms.id in (?1) ")
@@ -23,6 +23,6 @@ public interface GroupRepository extends JpaRepository<Group, Integer> {
 	@Query("select g from Group as g join fetch g.permissions perms where g.id in (?1) ")
 	List<Group> findByIds(Set<Integer> groupIds);
 	
-	@Query("select g from Group as g join fetch g.permissions perms where g.groupType = ?1")
+	@Query("select distinct g from Group as g join fetch g.permissions perms where g.groupType = ?1")
 	List<Group> findByType(GroupType type);
 }

diff --git a/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java b/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
index c47550d..2d91ffa 100644
--- a/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
+++ b/sm-search/src/main/java/com/shopizer/search/services/impl/SearchDelegateImpl.java
@@ -261,31 +261,14 @@ public class SearchDelegateImpl implements SearchDelegate {
 
 			if(ids!=null && ids.size()>0) {
 				
-				//BulkRequestBuilder bulkRequest = client.prepareBulk();
-				
-				
-			    //.defaultType(object);
-			    //.addAction(new Index.Builder(article1).build())
-			    //.addAction(new Index.Builder(article2).build())
-			    //.addAction(new Delete.Builder("1").index("twitter").type("tweet").build())
-			    //.build();
-				
 				Bulk.Builder bulk = new Bulk.Builder()
 			    .defaultIndex(collection);
 				
 				for(String s : ids) {
-					
-					
-					
-					
-					//DeleteRequest dr = new DeleteRequest();
-					//dr.type("keyword").index(collection).id(s);
+
 					bulk.defaultType(object)
 					.addAction(new Delete.Builder(s).index(collection).type(object).build());
-					
-					//System.out.println(dr.toString());
-					
-					//bulkRequest.add(dr);
+
 					
 				}
 				
@@ -309,24 +292,16 @@ public class SearchDelegateImpl implements SearchDelegate {
 	 */
 	@Override
 	public void bulkIndexKeywords(Collection<IndexKeywordRequest> bulks, String collection, String object) throws Exception {
-		
 
-			//Client client = searchClient.getClient();
-			
 			JestClient client = searchClient.getClient();
-			
-			//BulkRequestBuilder bulkRequest = client.prepareBulk();
-			
+
 			Bulk.Builder bulk = new Bulk.Builder()
 		    .defaultIndex(collection)
 		    .defaultType(object);
 			
 			//@todo, index in appropriate Locale
 			for(IndexKeywordRequest key : bulks) {
-			
-				// either use client#prepare, or use Requests# to directly build index/delete requests 
-				//bulkRequest.add(client.prepareIndex(collection, object, key.getId()) 
-				
+
 				String id = key.getKey();
 				if(id.length()>25) {
 					id = id.substring(0,25);

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 1e8d04d..91747a8 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
-#Fri Nov 11 10:11:04 EST 2016
+#Mon Nov 14 10:53:55 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index 6ed751c..3404c64 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 859754c..cbc6446 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -74,7 +74,6 @@
 		<dependency>
 			<groupId>org.springframework.mobile</groupId>
 			<artifactId>spring-mobile-device</artifactId>
-			<version>${spring-mobile-device-version}</version>
 		</dependency>
 		
 		<!-- Add Apache Tiles into the mix -->

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
index c47f067..2cce04f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
@@ -6,6 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 import org.springframework.web.servlet.view.tiles3.TilesView;
@@ -18,6 +19,7 @@ import com.salesmanager.core.business.configuration.CoreApplicationConfiguration
 @EnableAutoConfiguration
 @Import(CoreApplicationConfiguration.class)//import sm-core configurations
 @ImportResource("spring/shopizer-shop-context.xml")
+@EnableWebSecurity
 public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
 	
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
index 8aad5c2..b153c6b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
@@ -70,14 +70,19 @@ public class InitializationLoader {
 
 				  Group gsuperadmin = new Group("SUPERADMIN");
 				  gsuperadmin.setGroupType(GroupType.ADMIN);
+				  
 				  Group gadmin = new Group("ADMIN");
 				  gadmin.setGroupType(GroupType.ADMIN);
+				  
 				  Group gcatalogue = new Group("ADMIN_CATALOGUE");
 				  gcatalogue.setGroupType(GroupType.ADMIN);
+				 
 				  Group gstore = new Group("ADMIN_STORE");
 				  gstore.setGroupType(GroupType.ADMIN);
+				 
 				  Group gorder = new Group("ADMIN_ORDER");
 				  gorder.setGroupType(GroupType.ADMIN);
+				  
 				  Group gcontent = new Group("ADMIN_CONTENT");
 				  gcontent.setGroupType(GroupType.ADMIN);
 

diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
index e4fc12a..202407c 100644
--- a/sm-shop/src/main/resources/application.properties
+++ b/sm-shop/src/main/resources/application.properties
@@ -1,2 +1,6 @@
-#spring.view.prefix: /WEB-INF/jsp/
-#spring.view.suffix: .jsp
\ No newline at end of file
+logging.level.org.springframework.web: DEBUG
+logging.level.org.springframework.security: DEBUG
+
+#remove spring fav icon
+spring.mvc.favicon.enabled=false
+

diff --git a/sm-shop/src/main/resources/spring/shopizer-security.xml b/sm-shop/src/main/resources/spring/shopizer-security.xml
index 694a384..4216528 100644
--- a/sm-shop/src/main/resources/spring/shopizer-security.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-security.xml
@@ -24,6 +24,7 @@
 	</beans:bean>
 
 	<beans:bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder">
+	    <!-- strength 4 to 31 -->
 		<beans:constructor-arg value="11"/>
 	</beans:bean>
 	
@@ -37,7 +38,6 @@
 	<beans:bean id="userAuthenticationSuccessHandler" class="com.salesmanager.shop.admin.security.UserAuthenticationSuccessHandler">
 	</beans:bean>
 	
-	
 	<beans:bean id="servicesAuthenticationSuccessHandler" class="com.salesmanager.shop.store.security.ServicesAuthenticationSuccessHandler">
 	</beans:bean>
 	
@@ -46,26 +46,35 @@
 	
 	
 	
-	<http pattern="/admin/**" auto-config="true" use-expressions="true" authentication-manager-ref="userAuthenticationManager">
-		<!--<intercept-url pattern="/admin/logon.html*" access="permitAll" />-->
+	<http pattern="/admin/**" auto-config="true" use-expressions="true" authentication-manager-ref="adminAuthenticationManager">
+		<!-- Spring security login component -->
+		<intercept-url pattern="/admin/login" access="permitAll" />
+		<!-- Shopizer logon page -->
 		<intercept-url pattern="/admin/logon*" access="permitAll" />
 		<intercept-url pattern="/admin/denied.html" access="permitAll" />
 		<intercept-url pattern="/admin/unauthorized.html" access="permitAll" />
 		<intercept-url pattern="/admin/users/resetPassword.html*" access="permitAll" />
 		<intercept-url pattern="/admin/users/resetPasswordSecurityQtn.html*" access="permitAll" /> 
-		<intercept-url pattern="/admin" access="hasRole('AUTH')" />
+ 		<intercept-url pattern="/admin" access="hasRole('AUTH')" />
 		<intercept-url pattern="/admin/" access="hasRole('AUTH')" />
 		<intercept-url pattern="/admin/*.html*" access="hasRole('AUTH')" />
 		<intercept-url pattern="/admin/*/*.html*" access="hasRole('AUTH')" />
 		<intercept-url pattern="/admin/*/*/*.html*" access="hasRole('AUTH')" />
 
 		
-		<form-login 
-			login-processing-url="/admin/logon" 
+<!-- 		<form-login 
+			login-processing-url="/logonForm" 
 			login-page="/admin/logon.html"
 			authentication-success-handler-ref="userAuthenticationSuccessHandler"
 			authentication-failure-url="/admin/logon.html?login_error=true"
-			default-target-url="/admin/home.html" />
+			default-target-url="/admin/home.html" /> -->
+			
+		<form-login login-page="/admin/logon.html"
+					username-parameter="username" 
+					password-parameter="password" 
+					login-processing-url="/login" 
+					authentication-failure-url="/admin/logon.html?login_error=true" 
+		/>
 			
 			
 		<logout invalidate-session="true" 
@@ -103,7 +112,7 @@
 	
 	
 	<!-- REST services -->
-	<http pattern="/services/**" create-session="stateless" use-expressions="true" authentication-manager-ref="userAuthenticationManager" entry-point-ref="servicesAuthenticationEntryPoint">
+	<http pattern="/services/**" create-session="stateless" use-expressions="true" authentication-manager-ref="adminAuthenticationManager" entry-point-ref="servicesAuthenticationEntryPoint">
       <intercept-url pattern="/services/private/**" access="hasRole('AUTH')"/>
       <intercept-url pattern="/services/public/**" access="permitAll"/>
       <form-login authentication-success-handler-ref="servicesAuthenticationSuccessHandler" />
@@ -112,7 +121,7 @@
    
 	
 	
-	<authentication-manager id="userAuthenticationManager">
+	<authentication-manager id="adminAuthenticationManager">
 		<authentication-provider user-service-ref="userDetailsService">
 			<password-encoder hash="sha" />
 		</authentication-provider>

diff --git a/sm-shop/src/main/webapp/WEB-INF/views/admin/logon.jsp b/sm-shop/src/main/webapp/WEB-INF/views/admin/logon.jsp
index d49ddf5..23d089d 100644
--- a/sm-shop/src/main/webapp/WEB-INF/views/admin/logon.jsp
+++ b/sm-shop/src/main/webapp/WEB-INF/views/admin/logon.jsp
@@ -326,7 +326,7 @@
 					<div class="row">
 						<div id="controls">
 
-							<form method="post" id="logonForm" class="form-horizontal" action="<c:url value="/admin/logon"/>">
+							<form method="post" id="logonForm" class="form-horizontal" action="<c:url value="/login"/>">
 								<div class="control-group">
 									<label class="control-label" for="inputUser">
 										<s:message code="label.username" text="Username" />

diff --git a/sm-shop/src/main/webapp/WEB-INF/web.xml b/sm-shop/src/main/webapp/WEB-INF/web.xml
index f415acd..0db16c2 100644
--- a/sm-shop/src/main/webapp/WEB-INF/web.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/web.xml
@@ -1,40 +1,5 @@
 <?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>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>
-			classpath:spring/spring-context.xml
-			/WEB-INF/spring/root-context.xml
-			/WEB-INF/spring/appServlet/shopizer-properties.xml
-			/WEB-INF/spring/appServlet/shopizer-security.xml
-		</param-value>
-  </context-param>
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>
-        org.springframework.web.context.request.RequestContextListener
-    </listener-class>
-  </listener -->
-  <!--   <servlet>
-    <servlet-name>appServlet</servlet-name>
-    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-    <init-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>
-				classpath:spring/spring-context.xml
-				/WEB-INF/spring/appServlet/shopizer-properties.xml
-				/WEB-INF/spring/appServlet/servlet-context.xml
-			</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet> -->
-  
-  <servlet-mapping>
-    <servlet-name>appServlet</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
   
   
   <!--Start UTF-8 Encoding needed.-->
@@ -52,7 +17,7 @@
   </filter-mapping>
   <!-- End -->
   
-
+  <!-- Spring security -->
   <filter>
     <filter-name>springSecurityFilterChain</filter-name>
     <filter-class>
@@ -63,9 +28,7 @@
     <filter-name>springSecurityFilterChain</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
-  <welcome-file-list>
-    <welcome-file></welcome-file>
-  </welcome-file-list>
+  <!-- End -->
   
   
 

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 e0f1b8b..3b4c35e 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
-#Fri Nov 11 10:11:07 EST 2016
+#Mon Nov 14 13:10:10 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop