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 461cb59487b230603c00cbf6e43270d1fbd1905d..46cb6476aead42264a2baef4a1672aefa9ed996a 100644 (file)
--- 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 45e5457d9d6cca2d052a5b6c5c886533812d96e1..4c7df6b06f773590e916284c3d4e061dbd4f0cac 100644 (file)
--- 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 a3ca21b63383cf18a30e50b2fe332bff142b91df..1b6e766e53289c7185f5918b286878ff68eaa999 100644 (file)
--- 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>