QX 1.1 Migration

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

diff --git a/security/runtime/org.argeo.security.ria/config.json b/security/runtime/org.argeo.security.ria/config.json
index 2cff0013cc92ce128ff16c61ba76de037aab4f51..45eb7eb230d8d0c2f10d75d0dac9bceb79749805 100644 (file)
--- a/security/runtime/org.argeo.security.ria/config.json
+++ b/security/runtime/org.argeo.security.ria/config.json
@@ -35,13 +35,16 @@
       "library" :\r
       [\r
         {\r
-          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"\r
+          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json",\r
+          "uri"                 : "../qooxdoo-sdk/framework"\r
         },\r
         {\r
-          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json"\r
+          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",\r
+          "uri"                 : "${RIA_LIB_URI}/security"\r
         },\r
         {\r
-          "manifest" : "${ROOT}/Manifest.json"\r
+          "manifest" : "${ROOT}/Manifest.json",\r
+          "uri"                 : "."\r
         }\r
       ],\r
 \r
@@ -79,13 +82,22 @@
     {\r
       "extend" : ["common"],\r
 \r
-      "compile-source" :\r
+      "compile-options" :\r
       {\r
-        "file" : "${ROOT}/script/${APPLICATION}.js",\r
-        "locales" : "${LOCALES}",\r
-        "root" : "${ROOT}",\r
-        "gzip" : false\r
-      }\r
+       "paths" : \r
+       {\r
+               "file" : "${ROOT}/script/${APPLICATION}.js",\r
+               "root" : "${ROOT}",\r
+               "resource" : "resource",\r
+               "gzip"  : false\r
+       },\r
+       "code" : \r
+       {\r
+               "locales" :  "${LOCALES}"\r
+       }\r
+      },\r
+      \r
+      "compile" : { "type" : "source" }\r
     },\r
 \r
 \r
@@ -108,7 +120,7 @@
         "qx.debug" : ["off"]\r
       },\r
 \r
-      "compile-dist" :\r
+      "compile-options" :\r
       {\r
                  "paths" :\r
                  {\r
@@ -126,16 +138,8 @@
                    "locales"  : "${LOCALES}",\r
                    "optimize" : ["variables", "basecalls", "privates", "strings"]\r
                  }\r
-      /*\r
-      "file" : "${BUILD_PATH}/script/${APPLICATION}.js",\r
-        "target" : "${BUILD_PATH}",\r
-        "uri"  : "script/${APPLICATION}.js",\r
-        "root" : "${BUILD_PATH}",\r
-        "format" : "on",\r
-        "locales" : "${LOCALES}",\r
-        "optimize" : ["basecalls", "variables", "privates", "strings"]\r
-       */\r
-      }\r
+      },\r
+      "compile" : { "type" : "build" }\r
     },\r
 \r
 \r

diff --git a/security/runtime/org.argeo.security.ria/pom.xml b/security/runtime/org.argeo.security.ria/pom.xml
index 22be9cdb5b883a09389aef57c1215463c70dc377..5d7786aca3b60d0f8d2f7c2e031d5956e6fb2813 100644 (file)
--- a/security/runtime/org.argeo.security.ria/pom.xml
+++ b/security/runtime/org.argeo.security.ria/pom.xml
@@ -26,7 +26,7 @@
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
                                <version>${version.maven-argeo-qooxdoo}</version>
                                <configuration>
-                                       <sdkVersion>0.8.3</sdkVersion>
+                                       <sdkVersion>1.1.0</sdkVersion>
                                </configuration>
                                <executions>
                                        <execution>

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
index 607653a9f7fa0753397db8f64d52f92ef194984a..7309b45ffd6be7647afdd56d43338cb51cd1324f 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/Perspective.js
@@ -4,7 +4,7 @@
  */\r
 /* ************************************************************************\r
 \r
-#asset(resource/org.argeo.security.ria/*)\r
+#asset(org/argeo/security/ria/*)\r
 \r
 ************************************************************************ */\r
 \r
@@ -18,7 +18,7 @@ qx.Class.define("org.argeo.security.ria.Perspective", {
 \r
        statics : {\r
                LABEL : "RIA Security",\r
-               ICON : "org.argeo.security.ria/preferences-security.png",\r
+               ICON : "org/argeo/security/ria/preferences-security.png",\r
                ACCESS:"!ROLE_ANONYMOUS"\r
        },\r
        \r

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index 66d9fe9f36560d4226186364070af0cd4f0d2f44..9ae4eff77880d494cfdb1ab25bd869b369353e5b 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.ria.sample/window-close.png)
+#asset(org/argeo/ria/sample/window-close.png)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.RolesApplet",
 {
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                init : {
                        "reload" : {
                                label           : "Reload Data",
-                               icon            : "org.argeo.security.ria/view-refresh.png",
+                               icon            : "org/argeo/security/ria/view-refresh.png",
                                shortcut        : "Control+h",
                                enabled         : true,
                                menu            : "Roles",
@@ -42,7 +42,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                        },                      
                        "new_role" : {
                                label           : "Create Role", 
-                               icon            : "org.argeo.security.ria/list-add.png",
+                               icon            : "org/argeo/security/ria/list-add.png",
                                shortcut        : null,
                                enabled         : true,
                                menu            : "Roles",
@@ -63,7 +63,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                        },      
                        "delete_role" : {
                                label           : "Delete Role", 
-                               icon            : "org.argeo.security.ria/list-remove.png",
+                               icon            : "org/argeo/security/ria/list-remove.png",
                                shortcut        : null,
                                enabled         : true,
                                menu            : "Roles",
@@ -92,7 +92,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                        },                                              
                        "edit_role" : {
                                label           : "Edit Role", 
-                               icon            : "org.argeo.security.ria/document-properties.png",
+                               icon            : "org/argeo/security/ria/document-properties.png",
                                shortcut        : "Control+r",
                                enabled         : true,
                                menu            : "Roles",
@@ -162,7 +162,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                
                this.rolesUsersStub = {"ROLE_ADMIN":["gandalf"],"ROLE_USER":["demo","frodo","gandalf"]};
                                        
-               this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org.argeo.security.ria/go-next.png");
+               this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org/argeo/security/ria/go-next.png");
                this.toggleButton.set({
                        show:"icon",
                        margin:2,
@@ -174,7 +174,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                        this.setGuiMode(event.getData()?"filter":"clear");
                }, this);
                
-               this.saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");
+               this.saveButton = new qx.ui.form.Button("Save", "org/argeo/security/ria/document-save.png");
                this.saveButton.set({
                        show:"icon",
                        margin:2,
@@ -182,7 +182,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
                        visibility : "excluded"
                });
                
-               this.cancelButton = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/window-close.png");
+               this.cancelButton = new qx.ui.form.Button("Cancel", "org/argeo/security/ria/window-close.png");
                this.cancelButton.set({
                        show:"icon",
                        margin:2,

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
index 8298228291ddf7a047b40477a969ba225be7f034..85de9ae0169161d95b3b6a5371e2b42b7c117422 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 {
@@ -29,7 +29,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                init : {
                        "save_user" : {
                                label           : "Save", 
-                               icon            : "org.argeo.security.ria/document-save.png",
+                               icon            : "org/argeo/security/ria/document-save.png",
                                shortcut        : "Control+s",
                                enabled         : true,
                                menu            : "Users",
@@ -47,7 +47,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                        },
                        "add_nature" : {
                                label           : "Add Nature ...", 
-                               icon            : "org.argeo.security.ria/list-add.png",
+                               icon            : "org/argeo/security/ria/list-add.png",
                                shortcut        : null,
                                enabled         : true,
                                menu            : "Natures",
@@ -75,7 +75,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                        },
                        "remove_nature" : {
                                label           : "Remove Nature", 
-                               icon            : "org.argeo.security.ria/list-remove.png",
+                               icon            : "org/argeo/security/ria/list-remove.png",
                                shortcut        : null,
                                enabled         : true,
                                menu            : "Natures",
@@ -96,7 +96,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                        },
                        "close" : {
                                label           : "Close", 
-                               icon            : "org.argeo.security.ria/window-close.png",
+                               icon            : "org/argeo/security/ria/window-close.png",
                                shortcut        : "Control+w",
                                enabled         : true,
                                menu            : "Users",
@@ -187,7 +187,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                                        "commandId" : natures[key]
                                        });
                        }
-                       commands["add_nature"].command.setMenu(newMenu);                
+                       commands["add_nature"].command.setMenuDef(newMenu);             
                }, this);
                
                natureButton.setShow("icon");

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index 7f0c55335b3f3e54284daea95310122342621458..1149cb7f27a2de90947f047d603e8688fbcbf2e5 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UsersApplet",
 {
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                init : {
                        "new_user" : {
                                label           : "New User", 
-                               icon            : "org.argeo.security.ria/list-add.png",
+                               icon            : "org/argeo/security/ria/list-add.png",
                                shortcut        : "Control+n",
                                enabled         : true,
                                menu            : "Users",
@@ -49,7 +49,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                        },      
                        "delete_user" : {
                                label           : "Delete User", 
-                               icon            : "org.argeo.security.ria/list-remove.png",
+                               icon            : "org/argeo/security/ria/list-remove.png",
                                shortcut        : "Control+d",
                                enabled         : true,
                                menu            : "Users",
@@ -99,7 +99,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                        },                      
                        "edit_user" : {
                                label           : "Edit User", 
-                               icon            : "org.argeo.security.ria/document-properties.png",
+                               icon            : "org/argeo/security/ria/document-properties.png",
                                shortcut        : "Control+u",
                                enabled         : true,
                                menu            : "Users",
@@ -185,7 +185,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
        },
        
        _applyGuiMode : function(newMode, oldMode){
-               this.table.getSelectionModel().clearSelection();
+               this.table.getSelectionModel().resetSelection();
                this.resetHiddenRows();
                if(newMode == "filter"){
                        this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
@@ -240,7 +240,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
        
        loadUsersList : function(){
                var selectionModel = this.table.getSelectionModel();            
-               selectionModel.clearSelection();                
+               selectionModel.resetSelection();                
                var request = org.argeo.security.ria.SecurityAPI.getListUsersService();
                request.addListener("completed", function(response){
                        var jSon = response.getContent();
@@ -288,7 +288,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                
        applySelection : function(selectionValue, target, ignoreCase){
                var selectionModel = this.table.getSelectionModel();            
-               selectionModel.clearSelection();
+               selectionModel.resetSelection();
                if(!selectionValue){
                        return;
                }
@@ -305,7 +305,7 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
        },
        
        applyFilter : function(filterValues, target, ignoreCase){
-               this.table.clearSelection();
+               this.table.resetSelection();
                this.resetHiddenRows();                 
                for(var i=0;i<filterValues.length;i++){
                        this.tableModel.addRegex("^((?!"+filterValues[i]+").)*$", target, ignoreCase);

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
index 3aa2e2fd080381811454f93b9f5c0d5c26640b39..0af8bfdf5df3802171e49d7ed01acee85f539aad 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditor.js
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.security.ria/*)
+#asset(resource/org/argeo/security/ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.components.UserEditor",
 {
@@ -116,12 +116,12 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
                this.fakePane.setMarginTop(30);
                this.add(this.fakePane, {flex:1});
                
-               title = new qx.ui.basic.Atom("User Details", "org.argeo.security.ria/preferences-users.png");
+               title = new qx.ui.basic.Atom("User Details", "org/argeo/security/ria/preferences-users.png");
                title.setFont(qx.bom.Font.fromString("16px sans-serif bold"));                  
                this.buttonGB.add(title);
                this.buttonGB.add(new qx.ui.core.Spacer(), {flex:1});
 
-               var title2 = new qx.ui.basic.Atom("User Natures", "org.argeo.security.ria/identity.png");
+               var title2 = new qx.ui.basic.Atom("User Natures", "org/argeo/security/ria/identity.png");
                title2.setFont(qx.bom.Font.fromString("16px sans-serif bold"));                 
                this.natureButtonGB.add(title2);
                this.natureButtonGB.add(new qx.ui.core.Spacer(), {flex:1});             
@@ -218,9 +218,9 @@ qx.Class.define("org.argeo.security.ria.components.UserEditor",
                page.add(new qx.ui.container.Scroll(newClass.getContainer()), {edge:"center"});
                
                buttons = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, "center"));
-               var editB = new qx.ui.form.Button("Edit this Nature", "org.argeo.security.ria/document-properties-22.png");
-               var saveB = new qx.ui.form.Button("Save", "org.argeo.security.ria/dialog-apply.png");
-               var cancelB = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/dialog-cancel.png");
+               var editB = new qx.ui.form.Button("Edit this Nature", "org/argeo/security/ria/document-properties-22.png");
+               var saveB = new qx.ui.form.Button("Save", "org/argeo/security/ria/dialog-apply.png");
+               var cancelB = new qx.ui.form.Button("Cancel", "org/argeo/security/ria/dialog-cancel.png");
                buttons.add(editB);
                buttons.add(saveB);
                buttons.add(cancelB);

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
index 15bd3c088acd3626e09a24a95cd26f6b01952733..382e9945960359f1b1b33dd532ab580bc70e47a4 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/UserEditorPrefPane.js
@@ -8,7 +8,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditorPrefPane", {
                this.setSelfEdition(true);\r
                this.initGUI();         \r
                this.basicGB.setVisibility("excluded");\r
-               var saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");\r
+               var saveButton = new qx.ui.form.Button("Save", "org/argeo/security/ria/document-save.png");\r
                saveButton.addListener("execute", this.saveUser, this);\r
                this.buttonGB.add(saveButton);\r
                var authService = org.argeo.ria.session.AuthService.getInstance();\r
@@ -33,7 +33,7 @@ qx.Class.define("org.argeo.security.ria.components.UserEditorPrefPane", {
                },\r
                \r
                getPrefIcon : function(){\r
-                       return "org.argeo.security.ria/preferences-users.png";\r
+                       return "org/argeo/security/ria/preferences-users.png";\r
                }                       \r
        }\r
 });
\ No newline at end of file