X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fconfig.json;h=b988263a4be042d0db9a3c5404b794fbdcb51e83;hb=403dbbf39a3690334ba5e09e00a210367059504c;hp=38e9e362a0f271df42cc190de739bc2515a8489a;hpb=17812e41b338097856869c8013ac0622940d8f68;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/config.json b/org.argeo.slc.webapp/config.json
index 38e9e362a..b988263a4 100644
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -1,17 +1,21 @@
 {
-  "name"    : "slc",
+  "name"    : "ria",
 
   "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" :
   {
-    "APPLICATION"  : "org.argeo.slc.web",
+    "APPLICATION"  : "org.argeo.ria",
     "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-0.8-sdk/framework",
     "QOOXDOO_URI"  : "../qooxdoo-0.8-sdk/framework",
     "QXTHEME"      : "qx.theme.Modern",
@@ -21,7 +25,7 @@
     "ROOT"         : "src/main/webapp/",
 	"BUILD_PATH"   : "src/main/webapp/build",
 	"CACHE"		   : "cache" ,
-	"CUSTOM_PERSPECTIVE" : "org.argeo.slc.web.custom.Perspective"
+	"CUSTOM_PERSPECTIVE" : "org.argeo.slc.web.Perspective"
   },
 
   "jobs" : 
@@ -58,7 +62,7 @@
         "qx.version"     : "${QXVERSION}",
         "qx.theme"       : "${QXTHEME}",
         "qx.application" : "${APPLICATION}.Application",
-		"slc.Perspective": "${CUSTOM_PERSPECTIVE}"
+		"ria.Perspective": "${CUSTOM_PERSPECTIVE}"
       }
     },
 
@@ -147,23 +151,44 @@
     
     "slc-api" :
     {
-      "extend" : ["appconf::api"],
+      "extend" : ["apiconf::build"],
 
       "let" :
       {
-        "APIVIEWER_ROOT" : "${ROOT}",
-        "BUILD_PATH" : "./api",
+        "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/../component/apiviewer",
+        "BUILD_PATH" : "./target/site/argeo-ria-api/",
         "API_INCLUDE" : ["${APPLICATION}.*"]
       },
 
       "library" :
       [
         {
-          "manifest" : "Manifest.json",
-          "uri"      : ""
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"      : ".."
+        }
+      ]
+    },
+    
+    "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"      : ".."
         }
       ]
     }
+    
 	
   }
 }