X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fconfig.json;h=9ba200ec7ecb317b6de45da8f18a5223e3139561;hb=fcf101ccd5fb0eceb0729bdafedd98406c459210;hp=8631ee0f09bff636e5629543da2391c274a97403;hpb=14c481f0228ff318eec0b2e871b0131bf7bd06ab;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/config.json b/org.argeo.slc.webapp/config.json
index 8631ee0f0..9ba200ec7 100644
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -4,9 +4,13 @@
   "include" :
   [
     {
-      "path" : "src/main/webapp/qooxdoo-0.8-sdk/tool/data/config/application.json",
-      "as"   : "appconf"
-    }
+      "path" : "src/main/webapp/qooxdoo-0.8-sdk/component/apiviewer/api.json",
+      "as"   : "apiconf"
+    },
+    {
+      "path" : "src/main/webapp/qooxdoo-0.8-sdk/component/testrunner/testrunner.json",
+      "as"   : "testrunner"
+    }    
   ],
 
   "let" :
@@ -18,8 +22,10 @@
 	"QXICONTHEME"  : ["Tango"],
     "API_EXCLUDE"  : ["qx.legacy.*"],
     "LOCALES"      : [ "en" ],
-    "ROOT"         : "src/main/webapp/",
-	"BUILD_PATH"   : "src/main/webapp/build",
+    "ROOT"         : "src/main/webapp/argeo-ria-src",
+	"BUILD_PATH"   : "src/main/webapp/argeo-ria",
+	"RIA_LIB_PATH" : "src/main/webapp/argeo-ria-lib",
+	"RIA_LIB_URI"  : "../argeo-ria-lib",
 	"CACHE"		   : "cache" ,
 	"CUSTOM_PERSPECTIVE" : "org.argeo.slc.web.Perspective"
   },
@@ -34,7 +40,14 @@
           "manifest" : "${QOOXDOO_PATH}/Manifest.json",
           "uri"      : "${QOOXDOO_URI}"
         },
-
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc-web"
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc"
+        },
         {
           "manifest" : "${ROOT}/Manifest.json",
           "uri"      : ".."
@@ -70,9 +83,9 @@
 
       "compile-source" :
       {
-        "file" : "${ROOT}/source/script/${APPLICATION}.js",
+        "file" : "${ROOT}/script/${APPLICATION}.js",
         "locales" : "${LOCALES}",
-        "root" : "${ROOT}/source"
+        "root" : "${ROOT}"
       }
     },
 
@@ -130,7 +143,7 @@
         [
           "index.html"
         ],
-		"source" : "${ROOT}/source",
+		"source" : "${ROOT}",
         "target" : "${BUILD_PATH}"
       }
     },
@@ -147,23 +160,52 @@
     
     "slc-api" :
     {
-      "extend" : ["appconf::api"],
+      "extend" : ["apiconf::build"],
 
       "let" :
       {
-        "APIVIEWER_ROOT" : "${ROOT}",
-        "BUILD_PATH" : "./api",
-        "API_INCLUDE" : ["${APPLICATION}.*"]
+        "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/../component/apiviewer",
+        "BUILD_PATH" : "./target/site/argeo-ria-api/",
+        "API_INCLUDE" : ["${APPLICATION}.*", "${CUSTOM_PERSPECTIVE}"]
       },
 
       "library" :
       [
         {
-          "manifest" : "Manifest.json",
-          "uri"      : ""
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"      : ".."
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc-web"
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc"
+        }        
+      ]
+    },
+    
+    "slc-test" :
+    {
+      "extend" : ["testrunner::build"],
+
+      "let" :
+      {
+        "TESTRUNNER_ROOT" : "${QOOXDOO_PATH}/../component/testrunner",
+        "TEST_INCLUDE"    : "${APPLICATION}.test.*",
+        "BUILD_PATH"      : "./target/site/argeo-ria-test/"
+      },
+
+      "library" :
+      [
+        {
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"      : ".."
         }
       ]
     }
+    
 	
   }
 }