QX 1.1 Migration

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

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index e07106ed9dfaf3ccf618306d93c502f0ad83c252..0e7e185e3e018e9eea9d6c54217b4dda4634d972 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -35,22 +35,28 @@
       "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}/slc/Manifest.json"\r
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",\r
+          "uri"      : "${RIA_LIB_URI}/slc"          \r
         },\r
         {\r
-          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json"\r
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",\r
+          "uri"      : "${RIA_LIB_URI}/slc-web"          \r
         },\r
         {\r
-          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json"\r
+          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",\r
+          "uri"      : "${RIA_LIB_URI}/jcr"          \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
@@ -87,13 +93,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
@@ -116,7 +131,7 @@
         "qx.debug" : ["off"]\r
       },\r
 \r
-      "compile-dist" :\r
+      "compile-options" :\r
       {\r
                  "paths" :\r
                  {\r
@@ -134,16 +149,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/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 788e58a3fff0d91a34a36780fdb485a4b8c812e4..4c0355e29e566fffeb054a16bcc789f63a5022c6 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.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>