X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fconfig.json;h=00f91d82d20049a74a5fcdbd154e73325f6490b4;hb=3e24f32c95b5ac3ec7fcae7000c4a8cfb857d514;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..00f91d82d 100644
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -4,24 +4,29 @@
   "include" :
   [
     {
-      "path" : "src/main/webapp/qooxdoo-0.8-sdk/tool/data/config/application.json",
-      "as"   : "appconf"
-    }
+      "path" : "${QOOXDOO_PATH}/component/apiviewer/api.json",
+      "as"   : "apiconf"
+    },
+    {
+      "path" : "${QOOXDOO_PATH}/component/testrunner/testrunner.json",
+      "as"   : "testrunner"
+    }    
   ],
 
   "let" :
   {
     "APPLICATION"  : "org.argeo.ria",
-    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-0.8-sdk/framework",
-    "QOOXDOO_URI"  : "../qooxdoo-0.8-sdk/framework",
+    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-sdk",
     "QXTHEME"      : "qx.theme.Modern",
 	"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" : 
@@ -31,20 +36,23 @@
       "library" :
       [
         {
-          "manifest" : "${QOOXDOO_PATH}/Manifest.json",
-          "uri"      : "${QOOXDOO_URI}"
+          "manifest" : "${QOOXDOO_PATH}/framework/Manifest.json"
         },
-
         {
-          "manifest" : "${ROOT}/Manifest.json",
-          "uri"      : ".."
+          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json"
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json"
+        },
+        {
+          "manifest" : "${ROOT}/Manifest.json"
         }
       ],
 
       "include" :
       [
         "${APPLICATION}.Application",
-        "${CUSTOM_PERSPECTIVE}",
+        "${CUSTOM_PACKAGE}.*",
         "${QXTHEME}"
       ],
 
@@ -58,7 +66,7 @@
         "qx.version"     : "${QXVERSION}",
         "qx.theme"       : "${QXTHEME}",
         "qx.application" : "${APPLICATION}.Application",
-		"ria.Perspective": "${CUSTOM_PERSPECTIVE}"
+        "ria.StartupPerspective":"org.argeo.slc.web.Perspective"		
       }
     },
 
@@ -70,9 +78,10 @@
 
       "compile-source" :
       {
-        "file" : "${ROOT}/source/script/${APPLICATION}.js",
+        "file" : "${ROOT}/script/${APPLICATION}.js",
         "locales" : "${LOCALES}",
-        "root" : "${ROOT}/source"
+        "root" : "${ROOT}",
+        "gzip" : false
       }
     },
 
@@ -98,13 +107,31 @@
 
       "compile-dist" :
       {
+		  "paths" :
+		  {
+	        "file" : "${BUILD_PATH}/script/${APPLICATION}.js",
+		    "gzip"     : false
+		  },
+		  "uris" :
+		  {
+		    "script"   : "script",
+		    "resource" : "resource"
+		  },
+		  "code" :
+		  {
+		    "format"   : true,
+		    "locales"  : "${LOCALES}",
+		    "optimize" : ["variables", "basecalls", "privates", "strings"]
+		  }
+      /*
+      "file" : "${BUILD_PATH}/script/${APPLICATION}.js",
         "target" : "${BUILD_PATH}",
-        "file" : "${BUILD_PATH}/script/${APPLICATION}.js",
         "uri"  : "script/${APPLICATION}.js",
         "root" : "${BUILD_PATH}",
         "format" : "on",
         "locales" : "${LOCALES}",
         "optimize" : ["basecalls", "variables", "privates", "strings"]
+       */
       }
     },
 
@@ -130,7 +157,7 @@
         [
           "index.html"
         ],
-		"source" : "${ROOT}/source",
+		"source" : "${ROOT}",
         "target" : "${BUILD_PATH}"
       }
     },
@@ -147,23 +174,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_PACKAGE}.*"]
       },
 
       "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"      : ".."
         }
       ]
     }
+    
 	
   }
 }