From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 8 Nov 2012 19:31:30 +0000 (+0000)
Subject: Rename remember-me RAP servlet
X-Git-Tag: argeo-commons-2.1.30~765
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=8be548add274d26337e93b62ff44407bc0a3bd6d;p=lgpl%2Fargeo-commons.git

Rename remember-me RAP servlet

git-svn-id: https://svn.argeo.org/commons/trunk@5762 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/security/plugins/org.argeo.security.ui.rap/plugin.xml
index 461cb5948..46cb6476a 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -37,7 +37,15 @@
       	</branding>
     	<branding
 			id="org.argeo.security.ui.rap.branding"
-            servletName="ui"
+            servletName="default"
+            defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
+            title="Argeo Web UI"
+            favicon="branding/favicon.ico"
+            body="branding/login.html">
+      	</branding>
+    	<branding
+			id="org.argeo.security.ui.rap.branding"
+            servletName="private"
             defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
             title="Argeo Web UI"
             favicon="branding/favicon.ico"
diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml
index 45e5457d9..4c7df6b06 100644
--- a/server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml
+++ b/server/modules/org.argeo.server.rap.webapp/WEB-INF/security-filters.xml
@@ -8,7 +8,7 @@
 
 	<bean id="springSecurityFilterChain" class="org.springframework.security.util.FilterChainProxy">
 		<sec:filter-chain-map path-type="ant">
-			<sec:filter-chain pattern="/ui"
+			<sec:filter-chain pattern="/private"
 				filters="session,x509,basic,rememberMe,exception,interceptor" />
 			<sec:filter-chain pattern="/basicauth"
 				filters="session,x509,basic,exception,interceptor" />
diff --git a/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml
index a3ca21b63..1b6e766e5 100644
--- a/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml
@@ -44,7 +44,7 @@
 <!---->
 	<filter-mapping>
 		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/ui</url-pattern>
+		<url-pattern>/private</url-pattern>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>springSecurityFilterChain</filter-name>