From 78bd2e8f957d3198f2d6c0482be298f83481328e Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Sat, 6 Dec 2008 15:26:06 +0000
Subject: [PATCH] Set CUSTOM_PERSPECTIVE in config.json / Fix jetty lock bug by
 using our own webdefault.xml

git-svn-id: https://svn.argeo.org/slc/trunk@1888 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.webapp/config.json | 30 +++++++++++++++++++++++++++---
 org.argeo.slc.webapp/pom.xml     |  1 +
 2 files changed, 28 insertions(+), 3 deletions(-)

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