ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1732298 - in /ace/trunk: run-client/ run-client/conf/ run-obr/ run-relay/ run-server-allinone/ run-server-allinone/conf/ run-server/
Date Thu, 25 Feb 2016 13:23:41 GMT
Author: jawi
Date: Thu Feb 25 13:23:41 2016
New Revision: 1732298

URL: http://svn.apache.org/viewvc?rev=1732298&view=rev
Log:
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.


Modified:
    ace/trunk/run-client/client.bndrun
    ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
    ace/trunk/run-obr/obr.bndrun
    ace/trunk/run-relay/relay.bndrun
    ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
    ace/trunk/run-server-allinone/server-allinone.bndrun
    ace/trunk/run-server/server.bndrun

Modified: ace/trunk/run-client/client.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Thu Feb 25 13:23:41 2016
@@ -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

Modified: ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg Thu Feb 25 13:23:41 2016
@@ -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

Modified: ace/trunk/run-obr/obr.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Thu Feb 25 13:23:41 2016
@@ -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

Modified: ace/trunk/run-relay/relay.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/relay.bndrun?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-relay/relay.bndrun (original)
+++ ace/trunk/run-relay/relay.bndrun Thu Feb 25 13:23:41 2016
@@ -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

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg Thu Feb 25 13:23:41
2016
@@ -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 @@ obr.xml = index.xml
 # 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

Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Thu Feb 25 13:23:41 2016
@@ -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,\

Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1732298&r1=1732297&r2=1732298&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Thu Feb 25 13:23:41 2016
@@ -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



Mime
View raw message