+ Workaround the autorefresh issue in RAP by disabling the branding page with Java...

+ 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

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 5747b8900ca49f4534c5ae4d77e04f4f9e724de6..17d4e22f3f0c2df1c16065ab8f98fedfed875e6b 100644 (file)
--- 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 a5008a88117084561e9258d34e16ade501cf90e5..c85c9666df144a9dd9dce86bc0af956c71c3875c 100644 (file)
--- 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"