From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 May 2013 12:44:59 +0000 (+0000)
Subject: Adapt to RAP 2.0 changes
X-Git-Tag: svn/tags/argeo-commons-2.1.2.tp~15
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=3de470e3ef081e6c060d28c8ac14eba93e2abc75;p=lgpl%2Fargeo-commons.git

Adapt to RAP 2.0 changes

git-svn-id: https://svn.argeo.org/commons/branches/2.tp@6261 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 fdc565169..fe4714df8 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -6,22 +6,22 @@
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.SecureEntryPoint"
-            path="secureWebUi">
+            path="/secureWebUi">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.anonymousEntryPoint"
             class="org.argeo.security.ui.rap.AnonymousEntryPoint"
-            path="publicWebUi">
+            path="/publicWebUi">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.logoutEntryPoint"
             class="org.argeo.security.ui.rap.LogoutEntryPoint"
-            path="logout">
+            path="/logout">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.nullEntryPoint"
             class="org.argeo.security.ui.rap.NullEntryPoint"
-            path="null">
+            path="/nullEP">
       </entrypoint>
    </extension>
 
@@ -29,56 +29,42 @@
          point="org.eclipse.rap.ui.branding">
     	<branding
 			id="org.argeo.security.ui.rap.branding"
-            servletName="node"
-            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="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"
             body="branding/login.html">
       	</branding>
     	<branding
 			id="org.argeo.security.ui.rap.branding"
-            servletName="basicauth"
-            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="clientauth"
-            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="public"
-            defaultEntrypointId="org.argeo.security.ui.rap.anonymousEntryPoint"
             title="Argeo Public Web UI"
             favicon="branding/favicon.ico"
             body="branding/public.html">
       	</branding>
     	<branding
 			id="org.argeo.security.ui.rap.branding"
-            servletName="logout"
-            defaultEntrypointId="org.argeo.security.ui.rap.logoutEntryPoint"
             title="Argeo Logout"
             favicon="branding/favicon.ico"
             body="branding/afterLogout.html">
@@ -86,8 +72,6 @@
       	<!-- we need a servlet with thios name j_spring_security_logout for the logout filter -->
     	<branding
 			id="org.argeo.security.ui.rap.branding"
-            servletName="j_spring_security_logout"
-            defaultEntrypointId="org.argeo.security.ui.rap.nullEntryPoint"
             title="Argeo Logout"
             favicon="branding/favicon.ico"
             body="branding/empty.html">