X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fconfig.json;h=0e7e185e3e018e9eea9d6c54217b4dda4634d972;hb=65a49f9f2a76a6d4af180165433a2249611decb0;hp=00f91d82d20049a74a5fcdbd154e73325f6490b4;hpb=9b1896a43d37f6f58374a732fd23912fd26a6cf3;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 00f91d82d..0e7e185e3 100644
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -12,18 +12,17 @@
       "as"   : "testrunner"
     }    
   ],
-
+  
   "let" :
   {
     "APPLICATION"  : "org.argeo.ria",
-    "QOOXDOO_PATH" : "src/main/webapp/qooxdoo-sdk",
-    "QXTHEME"      : "qx.theme.Modern",
-	"QXICONTHEME"  : ["Tango"],
+    "QOOXDOO_PATH" : "src/qooxdoo-sdk",
+    "QXTHEME"      : "org.argeo.ria.theme.RiaTheme",
     "API_EXCLUDE"  : ["qx.legacy.*"],
     "LOCALES"      : [ "en" ],
-    "ROOT"         : "src/main/webapp/argeo-ria-src",
-	"BUILD_PATH"   : "src/main/webapp/argeo-ria",
-	"RIA_LIB_PATH" : "src/main/webapp/argeo-ria-lib",
+    "ROOT"         : "src/argeo-ria-src",
+	"BUILD_PATH"   : "target/classes/argeo-ria",
+	"RIA_LIB_PATH" : "src/argeo-ria-lib",
 	"RIA_LIB_URI"  : "../argeo-ria-lib",
 	"CACHE"		   : "cache" ,
 	"CUSTOM_PACKAGE" : "org.argeo.slc.web"
@@ -36,16 +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",
+          "uri"      : "${RIA_LIB_URI}/slc"          
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/slc-web"          
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/jcr"          
         },
         {
-          "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json"
+          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/security"          
         },
         {
-          "manifest" : "${ROOT}/Manifest.json"
+          "manifest" : "${ROOT}/Manifest.json",
+          "uri"		 : "."
         }
       ],
 
@@ -66,7 +77,13 @@
         "qx.version"     : "${QXVERSION}",
         "qx.theme"       : "${QXTHEME}",
         "qx.application" : "${APPLICATION}.Application",
-        "ria.StartupPerspective":"org.argeo.slc.web.Perspective"		
+        "ria.branding.splashScreen"		: "org.argeo.security.ria/ArgeoLogo.png",
+        "ria.branding.applicationTitle" : "Slc RIA",
+        "ria.auth.enableAuth"		: "true",
+        "ria.auth.credentialsURI"	: "/org.argeo.security.webapp/getCredentials.ria",
+        "ria.auth.loginURI"			: "/org.argeo.security.webapp/login.ria",
+        "ria.auth.logoutURI"		: "/org.argeo.security.webapp/logout.ria",
+        "ria.StartupPerspective":"org.argeo.slc.web.LauncherPerspective"		
       }
     },
 
@@ -76,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" }
     },
 
 
@@ -105,7 +131,7 @@
         "qx.debug" : ["off"]
       },
 
-      "compile-dist" :
+      "compile-options" :
       {
 		  "paths" :
 		  {
@@ -123,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" }
     },
 
 
@@ -166,9 +184,9 @@
     {
       "run" :
       [
-        "build-resources",
         "build-script",
-        "my-build-files"
+        "my-build-files",
+        "build-resources"
       ]
     },
     
@@ -193,6 +211,14 @@
           "manifest" : "${RIA_LIB_PATH}/slc-web/Manifest.json",
           "uri"      : "${RIA_LIB_URI}/slc-web"
         },
+        {
+          "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/jcr"
+        },
+        {
+          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",
+          "uri"      : "${RIA_LIB_URI}/security"
+        },
         {
           "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",
           "uri"      : "${RIA_LIB_URI}/slc"