Set CUSTOM_PERSPECTIVE in config.json / Fix jetty lock bug by using our own webdefaul...

git-svn-id: https://svn.argeo.org/slc/trunk@1888 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/config.json b/org.argeo.slc.webapp/config.json
index d88140fc73aca26bb3a378cb846ced1bfdece1fb..b08862ce30f40ab3df54bc841666a2dbde53a6a3 100644 (file)
--- a/org.argeo.slc.webapp/config.json
+++ b/org.argeo.slc.webapp/config.json
@@ -4,7 +4,8 @@
   "include" :\r
   [\r
     {\r
-      "path" : "G:/dev/qooxdoo-0.8-sdk/tool/data/config/application.json"\r
+      "path" : "G:/dev/qooxdoo-0.8-sdk/tool/data/config/application.json",\r
+      "as"   : "appconf"\r
     }\r
   ],\r
 \r
@@ -19,7 +20,8 @@
     "LOCALES"      : [ "en" ],\r
     "ROOT"         : "src/main/webapp/",\r
        "BUILD_PATH"   : "src/main/webapp/build",\r
-       "CACHE"            : "cache" \r
+       "CACHE"            : "cache" ,\r
+       "CUSTOM_PERSPECTIVE" : "org.argeo.slc.web.custom.Perspective"\r
   },\r
 \r
   "jobs" : \r
@@ -42,6 +44,7 @@
       "include" :\r
       [\r
         "${APPLICATION}.Application",\r
+        "${CUSTOM_PERSPECTIVE}",\r
         "${QXTHEME}"\r
       ],\r
 \r
@@ -54,7 +57,8 @@
       {\r
         "qx.version"     : "${QXVERSION}",\r
         "qx.theme"       : "${QXTHEME}",\r
-        "qx.application" : "${APPLICATION}.Application"\r
+        "qx.application" : "${APPLICATION}.Application",\r
+               "slc.Perspective": "${CUSTOM_PERSPECTIVE}"\r
       }\r
     },\r
 \r
@@ -139,6 +143,26 @@
         "build-script",\r
         "my-build-files"\r
       ]\r
+    },\r
+    \r
+    "slc-api" :\r
+    {\r
+      "extend" : ["appconf::api"],\r
+\r
+      "let" :\r
+      {\r
+        "APIVIEWER_ROOT" : "${ROOT}",\r
+        "BUILD_PATH" : "./api",\r
+        "API_INCLUDE" : ["${APPLICATION}.*"]\r
+      },\r
+\r
+      "library" :\r
+      [\r
+        {\r
+          "manifest" : "Manifest.json",\r
+          "uri"      : ""\r
+        }\r
+      ]\r
     }\r
        \r
   }\r

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 8afb5418d9daf480bf4a044948355307340f2048..6baf5e5d3127b37a5f0b818b95b69c176695d938 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -48,6 +48,7 @@
                                                        <goal>run</goal>
                                                </goals>
                                                <configuration>
+                                                       <webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
                                                        <scanIntervalSeconds>0</scanIntervalSeconds>
                                                        <daemon>true</daemon>
                                                        <jettyConfig>