From 425e3b31af65df8208206f786737bd1c5972b519 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Fri, 4 Apr 2014 09:00:28 +0000
Subject: [PATCH] + Workaround the autorefresh issue in RAP by disabling the
 branding page with Java Script. + There is no quick-win way to repair the RAP
 file upload

git-svn-id: https://svn.argeo.org/commons/trunk@6946 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../ui/specific/UploadFileWizardPage.java     |  2 +-
 .../org.argeo.security.ui.rap/plugin.xml      | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
index 5747b8900..17d4e22f3 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
@@ -60,7 +60,7 @@ public class UploadFileWizardPage extends WizardPage {
 	}
 
 	public String getObjectName() {
-		return null;
+		return fileUpload.getFileName();
 	}
 
 	public String getObjectType() {
diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/security/plugins/org.argeo.security.ui.rap/plugin.xml
index a5008a881..c85c9666d 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -39,13 +39,18 @@
     	<!-- themeId attribute is by default set to this value.
     			Left anyway to provide the pattern when defining a later 
     			own default theme for Argeo Rap UIs. 
-    			corresponding theme is found in spite of the warning -->  
+    			corresponding theme is found in spite of the warning -->
+    		
+    	<!--
+    	body="branding/login.html" 
+    	body attribute pointing to an auto refresh page triggers weird side effects: 
+    	the whole workbench is re-loaded (like pressing on F5) every now and then. 
+    	Must be checked. Removed from the time being.-->   
 		<branding
 			id="org.argeo.security.ui.rap.defaultBranding"
             themeId="org.eclipse.rap.rwt.theme.Default"
             title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
+            favicon="branding/favicon.ico">
       	</branding>
       	<!-- we need a servlet with this name j_spring_security_logout
       		 for the logout filter -->
@@ -58,29 +63,28 @@
    	</extension>
    	
    	<!-- LOCAL THEMES - Use the following to extend or overwrite default theme --> 
-<!--	<extension
+	<!--	<extension
 		point="org.eclipse.rap.ui.themes">
 		<themeContribution
 			themeId="org.eclipse.rap.rwt.theme.Default"
 			file="theme/defaultExt.css" /> 
 	</extension> -->
-   	
 
-   <extension
-         point="org.eclipse.equinox.security.callbackHandlerMapping">
-      <callbackHandlerMapping
+	<extension
+		point="org.eclipse.equinox.security.callbackHandlerMapping">
+		<callbackHandlerMapping
             callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
             configName="SPRING">
-      </callbackHandlerMapping>
-   </extension>
-   <extension
-         point="org.eclipse.equinox.security.callbackHandlerMapping">
-         <callbackHandlerMapping
-            callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
-            configName="NIX">
-      </callbackHandlerMapping>
-   </extension>
-   <extension
+		</callbackHandlerMapping>
+	</extension>
+	<extension
+		point="org.eclipse.equinox.security.callbackHandlerMapping">
+		<callbackHandlerMapping
+			callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
+			configName="NIX">
+		</callbackHandlerMapping>
+	</extension>
+	<extension
          point="org.eclipse.equinox.security.callbackHandlerMapping">
       <callbackHandlerMapping
             callbackHandlerId="org.argeo.security.ui.defaultLoginDialog"
-- 
2.30.2