From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 15 Jul 2010 09:25:25 +0000 (+0000)
Subject: QX 1.1 Migration
X-Git-Tag: argeo-slc-2.1.7~1226
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2f0d706c736e883156d3edd7cf9c49428d85bc59;hp=2d39dc86e9243757460c3854e38119baff6b73c8;p=gpl%2Fargeo-slc.git

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 e07106ed9..0e7e185e3 100644
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -35,22 +35,28 @@
       "library" :
       [
         {
-          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"
+          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json",
+          "uri"		 : "../qooxdoo-sdk/framework"
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc"          
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc-web"          
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/jcr"          
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/security"          
         },
         {
-          "manifest" : "${ROOT}/Manifest.json"
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"		 : "."
         }
       ],
 
@@ -87,13 +93,22 @@
     {
       "extend" : ["common"],
 
-      "compile-source" :
+      "compile-options" :
       {
-        "file" : "${ROOT}/script/${APPLICATION}.js",
-        "locales" : "${LOCALES}",
-        "root" : "${ROOT}",
-        "gzip" : false
-      }
+      	"paths" : 
+      	{
+      		"file" : "${ROOT}/script/${APPLICATION}.js",
+      		"root" : "${ROOT}",
+      		"resource" : "resource",
+      		"gzip"	: false
+      	},
+      	"code" : 
+      	{
+      		"locales" :  "${LOCALES}"
+      	}
+      },
+      
+      "compile" : { "type" : "source" }
     },
 
 
@@ -116,7 +131,7 @@
         "qx.debug" : ["off"]
       },
 
-      "compile-dist" :
+      "compile-options" :
       {
 		  "paths" :
 		  {
@@ -134,16 +149,8 @@
 		    "locales"  : "${LOCALES}",
 		    "optimize" : ["variables", "basecalls", "privates", "strings"]
 		  }
-      /*
-      "file" : "${BUILD_PATH}/script/${APPLICATION}.js",
-        "target" : "${BUILD_PATH}",
-        "uri"  : "script/${APPLICATION}.js",
-        "root" : "${BUILD_PATH}",
-        "format" : "on",
-        "locales" : "${LOCALES}",
-        "optimize" : ["basecalls", "variables", "privates", "strings"]
-       */
-      }
+      },
+      "compile" : { "type" : "build" }
     },
 
 
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 788e58a3f..4c0355e29 100644
--- 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>