Removed the need for the OSGi compendium bundle:
- use the proper APIs from the implementations;
- add the correct configuration properties for the Web UI;
- added the client-cert authentication mechanism by default.
git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1732298 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/run-client/client.bndrun b/run-client/client.bndrun
index 3f184e3..a123de5 100644
--- a/run-client/client.bndrun
+++ b/run-client/client.bndrun
@@ -2,23 +2,25 @@
-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.7
--runbundles: org.apache.felix.dependencymanager,\
+-runbundles: \
+ org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.log,\
org.apache.felix.prefs,\
org.apache.felix.configadmin,\
org.apache.felix.eventadmin,\
+ org.apache.felix.metatype,\
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
- osgi.cmpn,\
com.vaadin,\
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
org.apache.ace.authentication.processor.basicauth;version=latest,\
+ org.apache.ace.authentication.processor.clientcert;version=latest,\
org.apache.ace.authentication.processor.password;version=latest,\
org.apache.ace.client.repository.api;version=latest,\
org.apache.ace.client.repository.helper.base;version=latest,\
@@ -39,7 +41,6 @@
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
- org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.log.server.store.api;version=latest,\
org.apache.ace.log.server.store.file;version=latest,\
@@ -52,14 +53,16 @@
org.apache.ace.gogo;version=latest,\
org.apache.ace.feedback.common;version=latest,\
org.apache.ace.http.context;version=latest
--runrepos: Workspace,\
+
+-runrepos: \
+ Workspace,\
Release
--runproperties: org.apache.felix.log.storeDebug=true,\
+-runproperties: \
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache,\
+ org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server=localhost:8080,\
org.apache.ace.obr=localhost:8082,\
org.osgi.service.http.port=8081,\
- org.apache.felix.log.maxSize=1000,\
- launch.keep=true,\
- launch.storage.dir=bundle-cache
-
+ org.apache.felix.log.maxSize=1000
diff --git a/run-client/conf/org.apache.ace.webui.vaadin.cfg b/run-client/conf/org.apache.ace.webui.vaadin.cfg
index e56e94d..e555ddb 100644
--- a/run-client/conf/org.apache.ace.webui.vaadin.cfg
+++ b/run-client/conf/org.apache.ace.webui.vaadin.cfg
@@ -3,6 +3,8 @@
# The endpoint of the Vaadin UI
context.path = /
+vaadin.productionMode = true
+vaadin.cache.time = 3600
# Vaadin UI settings
ui.authentication.enabled = true
ui.authentication.user.name = dd
diff --git a/run-obr/obr.bndrun b/run-obr/obr.bndrun
index 6e1e8e5..1c68508 100644
--- a/run-obr/obr.bndrun
+++ b/run-obr/obr.bndrun
@@ -2,13 +2,16 @@
-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.7
--runbundles: org.apache.felix.dependencymanager,\
+-runbundles: \
+ org.apache.felix.dependencymanager,\
org.apache.felix.dependencymanager.shell,\
org.apache.felix.log,\
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
org.apache.felix.configadmin,\
+ org.apache.felix.metatype,\
+ org.apache.felix.eventadmin,\
org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.useradmin,\
@@ -18,21 +21,23 @@
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
org.apache.ace.authentication.processor.basicauth;version=latest,\
+ org.apache.ace.authentication.processor.clientcert;version=latest,\
org.apache.ace.authentication.processor.password;version=latest,\
org.apache.ace.obr.servlet;version=latest,\
org.apache.ace.useradmin.repository;version=latest,\
org.apache.ace.connectionfactory;version=latest,\
org.apache.ace.range.api;version=latest,\
org.apache.ace.repository.api;version=latest,\
- org.apache.ace.http.context;version=latest,\
- osgi.cmpn
+ org.apache.ace.http.context;version=latest
--runrepos: Workspace,\
+-runrepos: \
+ Workspace,\
Release
--runproperties: org.apache.felix.log.storeDebug=true,\
+-runproperties: \
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache,\
+ org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.osgi.service.http.port=8082,\
org.apache.felix.log.maxSize=1000,\
- org.apache.ace.server=localhost:8080,\
- launch.keep=true,\
- launch.storage.dir=bundle-cache
+ org.apache.ace.server=localhost:8080
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index 6617f27..979077b 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.bndrun
@@ -2,19 +2,20 @@
-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.7
--runbundles: org.apache.felix.dependencymanager,\
+-runbundles: \
+ org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.log,\
org.apache.felix.prefs,\
org.apache.felix.configadmin,\
org.apache.felix.eventadmin,\
+ org.apache.felix.metatype,\
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
- osgi.cmpn;version=latest,\
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
org.apache.ace.authentication.processor.basicauth;version=latest,\
@@ -41,15 +42,17 @@
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.useradmin.repository;version=latest,\
org.apache.ace.http.context;version=latest
--runrepos: Workspace,\
+
+-runrepos: \
+ Workspace,\
Release
--runproperties: org.apache.felix.log.storeDebug=true,\
+-runproperties: \
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache,\
+ org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server=localhost:8080,\
org.apache.ace.obr=localhost:8080,\
org.apache.ace.relay=localhost:8282,\
org.osgi.service.http.port=8282,\
- org.apache.felix.log.maxSize=1000,\
- launch.keep=true,\
- launch.storage.dir=bundle-cache
-
+ org.apache.felix.log.maxSize=1000
diff --git a/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg b/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
index 5a7b5c7..e555ddb 100644
--- a/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
+++ b/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
@@ -1,9 +1,10 @@
# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
# The endpoint of the Vaadin UI
-org.apache.ace.server.servlet.init.productionMode = true
context.path = /
+vaadin.productionMode = true
+vaadin.cache.time = 3600
# Vaadin UI settings
ui.authentication.enabled = true
ui.authentication.user.name = dd
@@ -16,5 +17,5 @@
# Session timeout; due to ACE-528 this is now set in ms!
session.timeout = 300000
# Tuning of the artifacts column
-artifacts.cache.rate = 0.1
+artifacts.cache.rate = 3
artifacts.page.length = 50
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index 3463b9a..496ba56 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.bndrun
@@ -8,6 +8,7 @@
org.apache.felix.log,\
org.apache.felix.prefs,\
org.apache.felix.configadmin,\
+ org.apache.felix.metatype,\
org.apache.felix.eventadmin,\
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
@@ -15,11 +16,11 @@
org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
- osgi.cmpn;version=latest,\
com.vaadin,\
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
org.apache.ace.authentication.processor.basicauth;version=latest,\
+ org.apache.ace.authentication.processor.clientcert;version=latest,\
org.apache.ace.authentication.processor.password;version=latest,\
org.apache.ace.client.repository.api;version=latest,\
org.apache.ace.client.repository.helper.base;version=latest,\
@@ -50,7 +51,6 @@
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
org.apache.ace.repository.servlets;version=latest,\
- org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.tageditor;version=latest,\
org.apache.ace.target.mgmt.ui;version=latest,\
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index 63c8f71..3f5bf77 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.bndrun
@@ -2,11 +2,13 @@
-runfw: org.apache.felix.framework;version='[5.2.0,6)'
-runee: JavaSE-1.7
--runbundles: org.apache.felix.dependencymanager,\
+-runbundles: \
+ org.apache.felix.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.log,\
org.apache.felix.prefs,\
org.apache.felix.configadmin,\
+ org.apache.felix.metatype,\
org.apache.felix.eventadmin,\
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
@@ -14,10 +16,10 @@
org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
- osgi.cmpn;version=latest,\
org.apache.ace.authentication.api;version=latest,\
org.apache.ace.authentication.impl;version=latest,\
org.apache.ace.authentication.processor.basicauth;version=latest,\
+ org.apache.ace.authentication.processor.clientcert;version=latest,\
org.apache.ace.authentication.processor.password;version=latest,\
org.apache.ace.useradmin.repository;version=latest,\
org.apache.ace.configurator.impl;version=latest,\
@@ -33,20 +35,21 @@
org.apache.ace.repository.api;version=latest,\
org.apache.ace.repository.impl;version=latest,\
org.apache.ace.repository.servlets;version=latest,\
- org.apache.ace.resourceprocessor.useradmin;version=latest,\
org.apache.ace.scheduler.impl;version=latest,\
org.apache.ace.log.server.store.api;version=latest,\
org.apache.ace.log.server.store.file;version=latest,\
org.apache.ace.feedback.common;version=latest,\
org.apache.ace.http.context;version=latest
--runrepos: Workspace,\
+
+-runrepos: \
+ Workspace,\
Release
--runproperties: org.apache.felix.log.storeDebug=true,\
+-runproperties: \
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache,\
+ org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server=localhost:8080,\
org.apache.ace.obr=localhost:8082,\
org.osgi.service.http.port=8080,\
- org.apache.felix.log.maxSize=1000,\
- launch.keep=true,\
- launch.storage.dir=bundle-cache
-
+ org.apache.felix.log.maxSize=1000
