X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fconfig.json;h=5bb1411c21212a4262fd537d9dde92b72ebe8d24;hb=491094a0f29847d649a3168eca18eca38e3ee7ff;hp=53e9142acf7230a5005e74246ec8e8fe8dc6f5dc;hpb=60bf9c03605e7a5161807af023f8ede3e3202ebc;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/config.json b/org.argeo.slc.webapp/config.json
index 53e9142ac..5bb1411c2 100644
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -6,7 +6,11 @@
     {
       "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,10 +22,12 @@
 	"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"
+	"CUSTOM_PACKAGE" : "org.argeo.slc.web"
   },
 
   "jobs" : 
@@ -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"      : ".."
@@ -44,7 +57,7 @@
       "include" :
       [
         "${APPLICATION}.Application",
-        "${CUSTOM_PERSPECTIVE}",
+        "${CUSTOM_PACKAGE}.*",
         "${QXTHEME}"
       ],
 
@@ -58,7 +71,7 @@
         "qx.version"     : "${QXVERSION}",
         "qx.theme"       : "${QXTHEME}",
         "qx.application" : "${APPLICATION}.Application",
-		"ria.Perspective": "${CUSTOM_PERSPECTIVE}"
+        "ria.StartupPerspective":"org.argeo.slc.web.LauncherPerspective"		
       }
     },
 
@@ -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}"
       }
     },
@@ -153,7 +166,35 @@
       {
         "APIVIEWER_ROOT" : "${QOOXDOO_PATH}/../component/apiviewer",
         "BUILD_PATH" : "./target/site/argeo-ria-api/",
-        "API_INCLUDE" : ["${APPLICATION}.*"]
+        "API_INCLUDE" : ["${APPLICATION}.*", "${CUSTOM_PACKAGE}.*"]
+      },
+
+      "library" :
+      [
+        {
+          "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" :
@@ -164,6 +205,7 @@
         }
       ]
     }
+    
 	
   }
 }