ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1731826 - in /ace/trunk: build/ cnf/localrepo/ cnf/localrepo/org.apache.felix.http.api/ org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/ org.apache.ace.authentication.itest/ org.apache.ace.authentication.itest/src/org/apac...
Date Tue, 23 Feb 2016 10:05:28 GMT
Author: jawi
Date: Tue Feb 23 10:05:26 2016
New Revision: 1731826

URL: http://svn.apache.org/viewvc?rev=1731826&view=rev
Log:
ACE-532 - Use R6 whiteboard:

- applied patch from @brampouwelse;
- this closes #6.


Added:
    ace/trunk/cnf/localrepo/org.apache.felix.http.api/
    ace/trunk/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-3.0.0.jar   (with props)
Removed:
    ace/trunk/org.apache.ace.http.itest/.classpath
    ace/trunk/org.apache.ace.http.itest/.gitignore
    ace/trunk/org.apache.ace.http.itest/bnd.bnd
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/EchoServlet.java
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/MockHttpService.java
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
    ace/trunk/org.apache.ace.http/listener.bnd
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/Activator.java
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/constants/HttpConstants.java
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/constants/packageinfo
Modified:
    ace/trunk/build/bnd.bnd
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/index.xml.sha
    ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java
    ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
    ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
    ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
    ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
    ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/Ace330Test.java
    ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
    ace/trunk/org.apache.ace.deployment/bnd.bnd
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/Activator.java
    ace/trunk/org.apache.ace.http/bnd.bnd
    ace/trunk/org.apache.ace.http/redirector.bnd
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/RedirectServlet.java
    ace/trunk/org.apache.ace.log.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
    ace/trunk/org.apache.ace.obr/bnd.bnd
    ace/trunk/org.apache.ace.obr/servlet.bnd
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java
    ace/trunk/org.apache.ace.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java
    ace/trunk/org.apache.ace.useradmin.itest/bnd.bnd
    ace/trunk/org.apache.ace.useradmin.itest/src/org/apache/ace/it/useradmin/UserAdminRepositoryTest.java
    ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
    ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinServlet.java
    ace/trunk/run-client/client.bndrun
    ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg
    ace/trunk/run-client/conf/org.apache.ace.gogo.servlet.cfg
    ace/trunk/run-client/conf/org.apache.ace.webui.vaadin.cfg
    ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg
    ace/trunk/run-obr/obr.bndrun
    ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
    ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.cfg
    ace/trunk/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
    ace/trunk/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
    ace/trunk/run-relay/relay.bndrun
    ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
    ace/trunk/run-server-allinone/conf/org.apache.ace.webui.vaadin.cfg
    ace/trunk/run-server-allinone/server-allinone.bndrun
    ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
    ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.cfg
    ace/trunk/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
    ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
    ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
    ace/trunk/run-server/server.bndrun

Modified: ace/trunk/build/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/build/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/build/bnd.bnd (original)
+++ ace/trunk/build/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -26,7 +26,6 @@
 	org.apache.ace.gogo,\
 	org.apache.ace.gogo.servlet,\
 	org.apache.ace.http,\
-	org.apache.ace.http.itest,\
 	org.apache.ace.identification,\
 	org.apache.ace.log,\
 	org.apache.ace.log.itest,\

Modified: ace/trunk/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Tue Feb 23 10:05:26 2016
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<repository increment="1454072349000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1456221019000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="bcpkix"/>
@@ -4242,6 +4242,104 @@
     </requirement>
   </resource>
   <resource>
+    <capability namespace="osgi.identity">
+      <attribute name="osgi.identity" value="org.apache.felix.http.api"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" type="Version" value="3.0.0"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="osgi.content" value="d74857f06a1369060e3cecc60ef0e76840cec4afae92bd197d48005dbc139386"/>
+      <attribute name="url" value="org.apache.felix.http.api/org.apache.felix.http.api-3.0.0.jar"/>
+      <attribute name="size" type="Long" value="26052"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="osgi.wiring.bundle" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="osgi.wiring.host" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.http"/>
+      <attribute name="version" type="Version" value="1.2.1"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+      <directive name="uses" value="javax.servlet,javax.servlet.http"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.http.context"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+      <directive name="uses" value="javax.servlet.http,org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+      <directive name="uses" value="org.osgi.service.http.runtime.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.http.runtime.dto"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+      <directive name="uses" value="org.osgi.dto,org.osgi.framework.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.http.whiteboard"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.apache.felix.http.api"/>
+      <attribute name="version" type="Version" value="2.0.6"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.http.api"/>
+      <attribute name="bundle-version" type="Version" value="3.0.0"/>
+      <directive name="uses" value="javax.servlet,org.osgi.service.http"/>
+    </capability>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=javax.servlet)(version&gt;=3.1.0)(!(version&gt;=4.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=javax.servlet.http)(version&gt;=3.1.0)(!(version&gt;=4.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.dto)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.8.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework.dto)(version&gt;=1.8.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.service.http.runtime.dto)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.service.http.context)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.service.http.whiteboard)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.service.http.runtime)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.service.http)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))"/>
+    </requirement>
+    <requirement namespace="osgi.ee">
+      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.6))"/>
+    </requirement>
+    <requirement namespace="osgi.ee">
+      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.6))"/>
+    </requirement>
+  </resource>
+  <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="org.apache.felix.http.jetty"/>
       <attribute name="type" value="osgi.bundle"/>

Modified: ace/trunk/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml.sha?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml.sha (original)
+++ ace/trunk/cnf/localrepo/index.xml.sha Tue Feb 23 10:05:26 2016
@@ -1 +1 @@
-80bd383da3db31a17db778f3ec4525d2aaecb999aa4805fb720c52746b6b5409
\ No newline at end of file
+af330675041e6e5b35b42de6ae09ed81ddeb46cc1babe1bc3eaf3629614a6ce2
\ No newline at end of file

Added: ace/trunk/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-3.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-3.0.0.jar?rev=1731826&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/localrepo/org.apache.felix.http.api/org.apache.felix.http.api-3.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java (original)
+++ ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java Tue Feb 23 10:05:26 2016
@@ -248,11 +248,6 @@ public class AgentUpdateTest extends Int
     @Override
     protected void configureProvisionedServices() throws Exception {
         String serverURL = String.format("http://localhost:%d/", TestConstants.PORT);
-        String obrURL = serverURL.concat("obr/");
-        configure("org.apache.ace.deployment.servlet.agent",
-            "org.apache.ace.server.servlet.endpoint", "/agent",
-            "obr.url", obrURL,
-            "authentication.enabled", "false");
 
         Map<String, String> props = new HashMap<>();
         props.put(AgentConstants.CONFIG_DISCOVERY_SERVERURLS, serverURL);

Modified: ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.authentication.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,6 +7,7 @@ Test-Cases: ${classes;CONCRETE;NAMED;*Te
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager,\
+	org.apache.felix.http.api,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.log.server.store.api;version=latest,\
@@ -15,7 +16,6 @@ Test-Cases: ${classes;CONCRETE;NAMED;*Te
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.obr.storage;version=latest,\
 	org.apache.ace.log.api;version=latest,\
@@ -44,7 +44,6 @@ Test-Cases: ${classes;CONCRETE;NAMED;*Te
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
 	org.apache.ace.log.listener;version=latest,\

Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.it.authentication;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -32,7 +34,6 @@ import org.apache.ace.connectionfactory.
 import org.apache.ace.discovery.DiscoveryConstants;
 import org.apache.ace.feedback.Descriptor;
 import org.apache.ace.feedback.Event;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.identification.IdentificationConstants;
 import org.apache.ace.log.Log;
 import org.apache.ace.log.server.store.LogStore;
@@ -113,8 +114,8 @@ public class LogAuthenticationTest exten
 
     @Override
     protected void configureProvisionedServices() throws Exception {
-
         String baseURL = "http://" + HOST + ":" + TestConstants.PORT;
+
         getService(SessionFactory.class).createSession("test-session-ID", null);
 
         configureFactory("org.apache.ace.server.repository.factory",
@@ -141,7 +142,7 @@ public class LogAuthenticationTest exten
             "name", "auditlog");
         configureFactory("org.apache.ace.log.server.servlet.factory",
             "name", "auditlog",
-            HttpConstants.ENDPOINT, AUDITLOG_ENDPOINT,
+            HTTP_WHITEBOARD_SERVLET_PATTERN, AUDITLOG_ENDPOINT.concat("/*"),
             "authentication.enabled", "true");
         configureFactory("org.apache.ace.log.server.store.factory",
             "name", "auditlog");

Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ObrAuthenticationTest.java Tue Feb 23 10:05:26 2016
@@ -19,6 +19,8 @@
 
 package org.apache.ace.it.authentication;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -32,7 +34,6 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.repository.ArtifactRepository;
 import org.apache.ace.connectionfactory.ConnectionFactory;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.obr.storage.OBRFileStoreConstants;
 import org.apache.ace.repository.Repository;
 import org.apache.ace.repository.RepositoryConstants;
@@ -99,7 +100,8 @@ public class ObrAuthenticationTest exten
             RepositoryConstants.REPOSITORY_MASTER, "true");
         
         configure("org.apache.ace.repository.servlet.RepositoryServlet",
-            HttpConstants.ENDPOINT, "/repository", "authentication.enabled", "false");
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/repository/*", 
+            "authentication.enabled", "false");
 
         configure("org.apache.ace.useradmin.repository",
             "repositoryLocation", "http://localhost:" + TestConstants.PORT + "/repository",
@@ -111,7 +113,7 @@ public class ObrAuthenticationTest exten
 
         configure("org.apache.ace.obr.servlet",
             "OBRInstance", "singleOBRServlet",
-            "org.apache.ace.server.servlet.endpoint", m_endpoint,
+            HTTP_WHITEBOARD_SERVLET_PATTERN, m_endpoint.concat("/*"),
             "authentication.enabled", "true");
 
         m_obrURL = new URL("http://localhost:" + TestConstants.PORT + m_endpoint + "/");

Modified: ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -5,10 +5,10 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	junit.osgi,\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
@@ -35,7 +35,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.useradmin.filestore,\
 	org.apache.felix.log,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\

Modified: ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.it.repositoryadmin;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
@@ -53,7 +55,6 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.FeatureRepository;
 import org.apache.ace.client.repository.repository.TargetRepository;
 import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.log.server.store.LogStore;
 import org.apache.ace.obr.storage.OBRFileStoreConstants;
@@ -135,7 +136,10 @@ public abstract class BaseRepositoryAdmi
         m_obrURL = new URL(baseURL);
 
         configure("org.apache.ace.client.repository", "obrlocation", m_obrURL.toExternalForm());
-        configure("org.apache.ace.obr.servlet", "OBRInstance", "singleOBRServlet", "org.apache.ace.server.servlet.endpoint", endpoint, "authentication.enabled", "false");
+        configure("org.apache.ace.obr.servlet", 
+            "OBRInstance", "singleOBRServlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, endpoint.concat("/*"), 
+            "authentication.enabled", "false");
         configure("org.apache.ace.obr.storage.file", "OBRInstance", "singleOBRStore", OBRFileStoreConstants.FILE_LOCATION_KEY, fileLocation);
 
         // Wait for the endpoint to respond.
@@ -306,7 +310,7 @@ public abstract class BaseRepositoryAdmi
         // sharing violation between this bundle and the servlet bundle. In stead, we make the servlet
         // use an invalid endpoint.
         Dictionary<String, Object> propsServlet = new Hashtable<>();
-        propsServlet.put(HttpConstants.ENDPOINT, endpoint + "invalid");
+        propsServlet.put(HTTP_WHITEBOARD_SERVLET_PATTERN, endpoint + "invalid");
         propsServlet.put("OBRInstance", "singleOBRServlet");
         propsServlet.put("authentication.enabled", "false");
         Configuration configServlet = m_configAdmin.getConfiguration("org.apache.ace.obr.servlet");
@@ -432,8 +436,9 @@ public abstract class BaseRepositoryAdmi
 
     protected void startRepositoryService() throws IOException {
         // configure the (replication)repository servlets
-        configure("org.apache.ace.repository.servlet.RepositoryServlet", HttpConstants.ENDPOINT,
-            ENDPOINT_NAME, "authentication.enabled", "false");
+        configure("org.apache.ace.repository.servlet.RepositoryServlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, ENDPOINT_NAME.concat("/*"), 
+            "authentication.enabled", "false");
     }
 
     @Override

Modified: ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -5,10 +5,10 @@
 	osgi.cmpn,\
 	junit.osgi,\
 	com.google.gson,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
@@ -39,7 +39,6 @@
 	org.apache.felix.useradmin.filestore,\
 	org.apache.felix.log,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\

Modified: ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/src/org/apache/ace/client/rest/itest/RESTClientTest.java Tue Feb 23 10:05:26 2016
@@ -33,6 +33,7 @@ import static org.apache.ace.client.rest
 import static org.apache.ace.client.rest.itest.ClientRestUtils.deleteResources;
 import static org.apache.ace.client.rest.itest.ClientRestUtils.ensureCleanStore;
 import static org.apache.ace.test.utils.FileUtils.createEmptyBundle;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
 
 import java.io.File;
 import java.io.IOException;
@@ -45,7 +46,6 @@ import org.apache.ace.client.rest.util.C
 import org.apache.ace.client.rest.util.WebResource;
 import org.apache.ace.client.rest.util.WebResourceException;
 import org.apache.ace.client.rest.util.WebResponse;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.test.constants.TestConstants;
 import org.apache.ace.test.utils.NetUtils;
@@ -368,20 +368,20 @@ public class RESTClientTest extends Inte
             "obrlocation", HOST.concat("/obr/"));
 
         configure("org.apache.ace.client.rest",
-            "org.apache.ace.server.servlet.endpoint", "/client",
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/client/*",
             "repository.url", HOST.concat("/repository"),
             "authentication.enabled", "false");
 
         configure("org.apache.ace.deployment.servlet",
-            "org.apache.ace.server.servlet.endpoint", "/deployment",
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/deployment/*",
             "authentication.enabled", "false");
 
         configure("org.apache.ace.repository.servlet.RepositoryServlet",
-            "org.apache.ace.server.servlet.endpoint", "/repository",
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/repository/*",
             "authentication.enabled", "false");
 
         configure("org.apache.ace.obr.servlet",
-            "org.apache.ace.server.servlet.endpoint", "/obr",
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/obr/*",
             "authentication.enabled", "false");
 
         configure("org.apache.ace.obr.storage.file",
@@ -409,7 +409,7 @@ public class RESTClientTest extends Inte
 
         configureFactory("org.apache.ace.log.server.servlet.factory",
             "name", "auditlog",
-            HttpConstants.ENDPOINT, "/auditlog",
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/auditlog/*",
             "authentication.enabled", "false");
 
         configureFactory("org.apache.ace.log.server.store.factory",

Modified: ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,10 +7,10 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	junit.osgi,\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
@@ -34,7 +34,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.deploymentadmin,\
 	org.apache.felix.log,\
 	org.apache.felix.prefs,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.deployment.api;version=latest,\

Modified: ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/Ace330Test.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/Ace330Test.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/Ace330Test.java (original)
+++ ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/Ace330Test.java Tue Feb 23 10:05:26 2016
@@ -22,6 +22,7 @@ import static org.apache.ace.it.deployme
 import static org.apache.ace.it.deployment.Constants.TEST_CUSTOMER;
 import static org.apache.ace.it.deployment.Constants.TEST_HTTP_PORT;
 import static org.apache.ace.it.deployment.Constants.TEST_TARGETID;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
 
 import java.io.File;
 import java.net.URL;
@@ -65,7 +66,7 @@ public class Ace330Test extends Integrat
         String obrLocation = m_obrLocation.toExternalForm();
 
         // configureFactory("org.apache.ace.log.server.servlet.factory", "name", "auditlog",
-        // "org.apache.ace.server.servlet.endpoint", "/auditlog", "authentication.enabled", "false");
+        // HTTP_WHITEBOARD_SERVLET_PATTERN, "/auditlog/*", "authentication.enabled", "false");
         // configureFactory("org.apache.ace.log.server.store.factory", "name", "auditlog");
         // the various repositories...
         configureFactory("org.apache.ace.server.repository.factory", "name", "deployment", "customer", TEST_CUSTOMER, "master", "true");
@@ -74,22 +75,39 @@ public class Ace330Test extends Integrat
         configureFactory("org.apache.ace.server.repository.factory", "name", "user", "customer", TEST_CUSTOMER, "master", "true", "initial", TEST_AUTH_SCHEME);
 
         configure("org.apache.ace.client.repository", "showunregisteredtargets", "true", "deploymentversionlimit", "3", "obrlocation", obrLocation);
-        configure("org.apache.ace.client.rest", "org.apache.ace.server.servlet.endpoint", "/client", "repository.url", repoLocation, "authentication.enabled", "false",
-            "customer.name", TEST_CUSTOMER, "store.repository.name", "shop",
-            "distribution.repository.name", "target", "deployment.repository.name", "deployment");
+        configure("org.apache.ace.client.rest", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/client/*", 
+            "repository.url", repoLocation, 
+            "authentication.enabled", "false",
+            "customer.name", TEST_CUSTOMER, 
+            "store.repository.name", "shop",
+            "distribution.repository.name", "target", 
+            "deployment.repository.name", "deployment");
 
         configure("org.apache.ace.deployment.provider.repositorybased", "url", repoLocation, "name", "deployment", "customer", TEST_CUSTOMER);
-        configure("org.apache.ace.deployment.servlet", "org.apache.ace.server.servlet.endpoint", "/deployment", "authentication.enabled", "false");
-        configure("org.apache.ace.deployment.servlet.agent", "org.apache.ace.server.servlet.endpoint", "/agent", "obr.url", obrLocation, "authentication.enabled", "false");
+        configure("org.apache.ace.deployment.servlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/deployment/*", 
+            "authentication.enabled", "false");
+        configure("org.apache.ace.deployment.servlet.agent", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/agent/*", 
+            "obr.url", obrLocation, 
+            "authentication.enabled", "false");
 
         configure("org.apache.ace.discovery.property", "serverURL", m_host);
         configure("org.apache.ace.identification.property", "targetID", TEST_TARGETID);
 
-        configure("org.apache.ace.obr.servlet", "org.apache.ace.server.servlet.endpoint", "/obr", "authentication.enabled", "false");
+        configure("org.apache.ace.obr.servlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/obr/*", 
+            "authentication.enabled", "false");
+        
         configure("org.apache.ace.obr.storage.file", "fileLocation", m_obrStorePath);
 
-        configure("org.apache.ace.repository.servlet.RepositoryReplicationServlet", "org.apache.ace.server.servlet.endpoint", "/replication", "authentication.enabled", "false");
-        configure("org.apache.ace.repository.servlet.RepositoryServlet", "org.apache.ace.server.servlet.endpoint", "/repository", "authentication.enabled", "false");
+        configure("org.apache.ace.repository.servlet.RepositoryReplicationServlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/replication/*", 
+            "authentication.enabled", "false");
+        configure("org.apache.ace.repository.servlet.RepositoryServlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/repository/*", 
+            "authentication.enabled", "false");
     }
 
     @Override

Modified: ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.it.deployment;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,7 +37,6 @@ import org.apache.ace.deployment.provide
 import org.apache.ace.deployment.provider.impl.ArtifactDataImpl;
 import org.apache.ace.deployment.util.test.BundleStreamGenerator;
 import org.apache.ace.discovery.DiscoveryConstants;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.identification.IdentificationConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.scheduler.constants.SchedulerConstants;
@@ -302,9 +303,12 @@ public class DeploymentIntegrationTest e
 
     private void configureServer() throws IOException {
         // configure data bundle
-        configure("org.apache.ace.deployment.servlet", HttpConstants.ENDPOINT, "/deployment", "authentication.enabled", "false");
+        configure("org.apache.ace.deployment.servlet", 
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/deployment/*", 
+            "authentication.enabled", "false");
         // configure file based backend
-        configure("org.apache.ace.deployment.provider.filebased", "BaseDirectoryName", m_tempDir.getAbsolutePath());
+        configure("org.apache.ace.deployment.provider.filebased", 
+            "BaseDirectoryName", m_tempDir.getAbsolutePath());
     }
 
     private void configureTarget() throws IOException {

Modified: ace/trunk/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -5,6 +5,7 @@
 	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.dependencymanager,\
 	com.vaadin,\

Modified: ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/Activator.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/Activator.java (original)
+++ ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/Activator.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.deployment.servlet;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN;
+
 import java.util.Properties;
 
 import javax.servlet.Filter;
@@ -56,7 +58,7 @@ public class Activator extends Dependenc
         );
         
         Properties props = new Properties();
-        props.put("pattern", "/*");
+        props.put(HTTP_WHITEBOARD_FILTER_PATTERN, "/*");
         manager.add(createComponent()
             .setInterface(Filter.class.getName(), null)
             .setImplementation(OverloadedFilter.class)

Modified: ace/trunk/org.apache.ace.http/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -5,5 +5,6 @@
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api
 -sub: *.bnd

Modified: ace/trunk/org.apache.ace.http/redirector.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/redirector.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/redirector.bnd (original)
+++ ace/trunk/org.apache.ace.http/redirector.bnd Tue Feb 23 10:05:26 2016
@@ -2,6 +2,6 @@
 
 Private-Package: org.apache.ace.http.redirector
 Bundle-Activator: org.apache.ace.http.redirector.Activator
-Bundle-Version: 1.0.2
+Bundle-Version: 1.0.3
 Bundle-Name: Apache ACE HTTP Redirector
 Bundle-Description: Redirects configured URLs
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java (original)
+++ ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java Tue Feb 23 10:05:26 2016
@@ -38,17 +38,15 @@ public class Activator extends Dependenc
     
     @Override
     public void init(BundleContext context, DependencyManager manager) throws Exception {
+        Properties properties = new Properties();
+        properties.put(Constants.SERVICE_PID, PID);
         manager.add(createComponent()
-            .setInterface(ManagedServiceFactory.class.getName(), new Properties() {{ put(Constants.SERVICE_PID, PID); }})
+            .setInterface(ManagedServiceFactory.class.getName(), properties)
             .setImplementation(this)
         );
     }
 
     @Override
-    public void destroy(BundleContext context, DependencyManager manager) throws Exception {
-    }
-    
-    @Override
     public String getName() {
         return "Http Redirector";
     }

Modified: ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/RedirectServlet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/RedirectServlet.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/RedirectServlet.java (original)
+++ ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/RedirectServlet.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.http.redirector;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.IOException;
 import java.util.Dictionary;
 
@@ -26,7 +28,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 
@@ -35,6 +36,9 @@ import org.osgi.service.cm.Configuration
  * show you the redirect (and you can still click on the target URL).
  */
 public class RedirectServlet extends HttpServlet {
+    
+    private static final long serialVersionUID = 1L;
+
     public static final String REDIRECT_URL_KEY = "org.apache.ace.webui.vaadin.redirect";
 
     private final Object LOCK = new Object();
@@ -73,9 +77,9 @@ public class RedirectServlet extends Htt
     private void setup(Dictionary<String, ?> properties) throws ConfigurationException {
         synchronized (LOCK) {
             m_redirectURL = (String) properties.get(REDIRECT_URL_KEY);
-            m_sourceURL = (String) properties.get(HttpConstants.ENDPOINT);
+            m_sourceURL = (String) properties.get(HTTP_WHITEBOARD_SERVLET_PATTERN);
             if (m_sourceURL == null) {
-                throw new ConfigurationException(HttpConstants.ENDPOINT, "needs to be specified");
+                throw new ConfigurationException(HTTP_WHITEBOARD_SERVLET_PATTERN, "needs to be specified");
             }
             if (m_redirectURL == null) {
                 throw new ConfigurationException(REDIRECT_URL_KEY, "needs to be specified");

Modified: ace/trunk/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,8 +7,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
+	org.apache.felix.http.api,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
@@ -35,7 +35,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.log.target.store.impl;version=latest,\
 	org.apache.ace.log.target;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.identification.property;version=latest,\
 	org.apache.ace.log.listener;version=latest,\

Modified: ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.it.log;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -26,7 +28,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.ace.discovery.DiscoveryConstants;
 import org.apache.ace.feedback.Descriptor;
 import org.apache.ace.feedback.Event;
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.identification.IdentificationConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.log.Log;
@@ -72,16 +73,20 @@ public class LogIntegrationTest extends
         configureFactory("org.apache.ace.target.log.factory",
                 "name", "auditlog");
         configureFactory("org.apache.ace.target.log.sync.factory",
-            "name", "auditlog", "authentication.enabled", "false");
+                "name", "auditlog", 
+                "authentication.enabled", "false");
 
         configure("org.apache.ace.deployment.servlet",
-                HttpConstants.ENDPOINT, DEPLOYMENT, "authentication.enabled", "false");
+                HTTP_WHITEBOARD_SERVLET_PATTERN, DEPLOYMENT.concat("/*"), 
+                "authentication.enabled", "false");
 
-        configure("org.apache.ace.log.server.store.filebased", "MaxEvents", "0");
+        configure("org.apache.ace.log.server.store.filebased", 
+                "MaxEvents", "0");
         
         configureFactory("org.apache.ace.log.server.servlet.factory",
                 "name", "auditlog",
-                HttpConstants.ENDPOINT, AUDITLOG, "authentication.enabled", "false");
+                HTTP_WHITEBOARD_SERVLET_PATTERN, AUDITLOG.concat("/*"), 
+                "authentication.enabled", "false");
         configureFactory("org.apache.ace.log.server.store.factory",
                 "name", "auditlog");
     }

Modified: ace/trunk/org.apache.ace.obr/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.obr/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,6 +7,7 @@
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
+	org.apache.felix.http.api,\
 	org.apache.felix.http.servlet-api,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.test;version=latest,\

Modified: ace/trunk/org.apache.ace.obr/servlet.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/servlet.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/servlet.bnd (original)
+++ ace/trunk/org.apache.ace.obr/servlet.bnd Tue Feb 23 10:05:26 2016
@@ -2,6 +2,6 @@
 
 Private-Package: org.apache.ace.obr.servlet
 Bundle-Activator: org.apache.ace.obr.servlet.Activator
-Bundle-Version: 1.0.2
+Bundle-Version: 1.0.3
 Bundle-Name: Apache ACE OBR Servlet
 Bundle-Description: Registers the ACE OBR servlet
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java (original)
+++ ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/servlet/BundleServlet.java Tue Feb 23 10:05:26 2016
@@ -18,13 +18,14 @@
  */
 package org.apache.ace.obr.servlet;
 
-import static javax.servlet.http.HttpServletResponse.SC_CREATED;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
 import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
 
 import java.io.Closeable;
 import java.io.EOFException;
@@ -83,15 +84,18 @@ public class BundleServlet extends HttpS
             boolean useAuth = Boolean.parseBoolean(useAuthString);
             m_useAuth = useAuth;
             
-            m_servletEndpoint = (String) settings.get("org.apache.ace.server.servlet.endpoint");
+            m_servletEndpoint = (String) settings.get(HTTP_WHITEBOARD_SERVLET_PATTERN);
             if(m_servletEndpoint == null){
                 m_servletEndpoint = "/";
             }
             if(!m_servletEndpoint.startsWith("/")){
                 m_servletEndpoint = "/" + m_servletEndpoint;
             }
-            if(!m_servletEndpoint.endsWith("/")){
-                m_servletEndpoint = m_servletEndpoint + "/";
+            if(m_servletEndpoint.endsWith("/*")){
+                m_servletEndpoint = m_servletEndpoint.substring(0, m_servletEndpoint.length() -1);
+            }
+            if (!m_servletEndpoint.endsWith("/")) {
+                m_servletEndpoint =  m_servletEndpoint + "/";
             }
         }
         else {

Modified: ace/trunk/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,8 +7,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
+	org.apache.felix.http.api,\
 	org.apache.felix.dependencymanager
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
@@ -21,7 +21,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.http.jetty,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java (original)
+++ ace/trunk/org.apache.ace.repository.itest/src/org/apache/ace/it/repository/RepositoryTest.java Tue Feb 23 10:05:26 2016
@@ -21,6 +21,7 @@ package org.apache.ace.it.repository;
 import static org.apache.ace.it.repository.Utils.get;
 import static org.apache.ace.it.repository.Utils.put;
 import static org.apache.ace.it.repository.Utils.query;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,7 +34,6 @@ import java.util.Hashtable;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.repository.Repository;
 import org.apache.ace.test.constants.TestConstants;
@@ -299,9 +299,11 @@ public class RepositoryTest extends Inte
         m_host = new URL("http://localhost:" + TestConstants.PORT);
 
         configure("org.apache.ace.repository.servlet.RepositoryReplicationServlet",
-            HttpConstants.ENDPOINT, "/replication", "authentication.enabled", "false");
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/replication/*", 
+            "authentication.enabled", "false");
         configure("org.apache.ace.repository.servlet.RepositoryServlet",
-            HttpConstants.ENDPOINT, "/repository", "authentication.enabled", "false");
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/repository/*", 
+            "authentication.enabled", "false");
 
         Utils.waitForWebserver(m_host);
     }

Modified: ace/trunk/org.apache.ace.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -7,9 +7,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
+	org.apache.felix.http.api,\
 	org.apache.felix.dependencymanager
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
@@ -24,7 +24,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.useradmin.itest/src/org/apache/ace/it/useradmin/UserAdminRepositoryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.itest/src/org/apache/ace/it/useradmin/UserAdminRepositoryTest.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.itest/src/org/apache/ace/it/useradmin/UserAdminRepositoryTest.java (original)
+++ ace/trunk/org.apache.ace.useradmin.itest/src/org/apache/ace/it/useradmin/UserAdminRepositoryTest.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.it.useradmin;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,7 +29,6 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.it.IntegrationTestBase;
 import org.apache.ace.range.SortedRangeSet;
 import org.apache.ace.repository.Repository;
@@ -59,12 +60,13 @@ public class UserAdminRepositoryTest ext
             conn.setDoOutput(true);
             conn.setChunkedStreamingMode(8192);
             conn.setRequestProperty("Content-Type", "application/octet-stream");
-            
+
             try (OutputStream os = conn.getOutputStream()) {
                 os.write("<roles><user name=\"user1\"><properties><test>changed</test></properties></user></roles>".getBytes());
             }
             assertEquals(200, conn.getResponseCode());
-        } finally {
+        }
+        finally {
             conn.disconnect();
         }
 
@@ -160,7 +162,8 @@ public class UserAdminRepositoryTest ext
         m_host = new URL("http://localhost:" + TestConstants.PORT);
 
         configure("org.apache.ace.repository.servlet.RepositoryServlet",
-            HttpConstants.ENDPOINT, "/repository", "authentication.enabled", "false");
+            HTTP_WHITEBOARD_SERVLET_PATTERN, "/repository/*",
+            "authentication.enabled", "false");
 
         configureFactory("org.apache.ace.server.repository.factory",
             "customer", "apache",

Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -23,7 +23,6 @@ Private-Package: org.apache.ace.useradmi
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.log.server.servlet;version=latest,\
 	org.apache.ace.range.api;version=latest,\

Modified: ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd Tue Feb 23 10:05:26 2016
@@ -4,6 +4,7 @@
 	${^-buildpath},\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
+	org.apache.felix.http.api,\
 	com.vaadin;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinServlet.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinServlet.java?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinServlet.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinServlet.java Tue Feb 23 10:05:26 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.ace.webui.vaadin;
 
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Dictionary;
@@ -40,7 +42,7 @@ public class VaadinServlet extends Abstr
     private static final long serialVersionUID = 1L;
 
     /** denotes what endpoint we're serving this servlet. */
-    private static final String KEY_SERVLET_ENDPOINT = "org.apache.ace.server.servlet.endpoint";
+    private static final String KEY_SERVLET_ENDPOINT = HTTP_WHITEBOARD_SERVLET_PATTERN;
     /** A boolean denoting whether or not authentication is enabled. */
     private static final String KEY_USE_AUTHENTICATION = "ui.authentication.enabled";
     /** Name of the user to log in as. */
@@ -64,7 +66,7 @@ public class VaadinServlet extends Abstr
     private static final URL DEFAULT_ACE_HOST;
     private static final URL DEFAULT_OBR_URL;
     private static final String DEFAULT_OBR_XML = "index.xml";
-    private static final String DEFAULT_SERVLET_ENDPOINT = "/ace";
+    private static final String DEFAULT_SERVLET_ENDPOINT = "/ace/*";
     private static final int DEFAULT_SESSION_TIMEOUT = 300; // in seconds.
     private static final double DEFAULT_CACHE_RATE = 1;
     private static final int DEFAULT_PAGE_LENGTH = 100;

Modified: ace/trunk/run-client/client.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Tue Feb 23 10:05:26 2016
@@ -34,7 +34,6 @@
 	org.apache.ace.verifier.impl;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.log.server.task;version=latest,\
 	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\

Modified: ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.client.rest.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/client
+osgi.http.whiteboard.servlet.pattern=/client/*
 session.timeout=300

Modified: ace/trunk/run-client/conf/org.apache.ace.gogo.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.gogo.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.gogo.servlet.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.gogo.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/gogo
+osgi.http.whiteboard.servlet.pattern=/gogo/*
 authentication.enabled=false

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=1731826&r1=1731825&r2=1731826&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 Tue Feb 23 10:05:26 2016
@@ -1,7 +1,7 @@
 # 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.endpoint = /ace
+osgi.http.whiteboard.servlet.pattern = /ace/*
 # Vaadin UI settings
 ui.authentication.enabled = true
 ui.authentication.user.name = dd

Modified: ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg (original)
+++ ace/trunk/run-obr/conf/org.apache.ace.obr.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/obr
+osgi.http.whiteboard.servlet.pattern=/obr/*
 authentication.enabled = false

Modified: ace/trunk/run-obr/obr.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Tue Feb 23 10:05:26 2016
@@ -12,7 +12,6 @@
 	org.apache.felix.http.servlet-api,\
 	org.apache.felix.http.jetty,\
 	org.apache.felix.useradmin,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.configurator.impl;version=latest,\
 	org.apache.ace.obr.metadata;version=latest,\
 	org.apache.ace.obr.storage;version=latest,\

Modified: ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg (original)
+++ ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.agent.cfg Tue Feb 23 10:05:26 2016
@@ -1,6 +1,6 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/agent
+osgi.http.whiteboard.servlet.pattern=/agent/*
 # no authentication is used...
 authentication.enabled = false
 # OBR settings

Modified: ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.cfg (original)
+++ ace/trunk/run-relay/conf/org.apache.ace.deployment.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/deployment
+osgi.http.whiteboard.servlet.pattern=/deployment/*
 authentication.enabled = false

Modified: ace/trunk/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg (original)
+++ ace/trunk/run-relay/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg Tue Feb 23 10:05:26 2016
@@ -1,5 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/auditlog
+osgi.http.whiteboard.servlet.pattern=/auditlog/*
 name = auditlog
 authentication.enabled = false

Modified: ace/trunk/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg (original)
+++ ace/trunk/run-relay/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/repository
+osgi.http.whiteboard.servlet.pattern=/repository/*
 authentication.enabled = false

Modified: ace/trunk/run-relay/relay.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/relay.bndrun?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-relay/relay.bndrun (original)
+++ ace/trunk/run-relay/relay.bndrun Tue Feb 23 10:05:26 2016
@@ -28,7 +28,6 @@
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.feedback.common;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.log.server.servlet;version=latest,\
 	org.apache.ace.log.server.store.api;version=latest,\

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.client.rest.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/client
+osgi.http.whiteboard.servlet.pattern=/client/*
+osgi.http.whiteboard.listener=true
 session.timeout=300

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.agent.cfg Tue Feb 23 10:05:26 2016
@@ -1,6 +1,6 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/agent
+osgi.http.whiteboard.servlet.pattern=/agent/*
 # OBR settings
 obr.url = http://${org.apache.ace.obr}/obr/
 authentication.enabled = false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.deployment.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/deployment
+osgi.http.whiteboard.servlet.pattern=/deployment/*
 authentication.enabled = false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.gogo.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/gogo
+osgi.http.whiteboard.servlet.pattern=/gogo/*
 authentication.enabled=false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.http.redirector.factory/root-to-ace.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/
+osgi.http.whiteboard.servlet.pattern=/
 org.apache.ace.webui.vaadin.redirect=/ace/

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg Tue Feb 23 10:05:26 2016
@@ -1,5 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/auditlog
+osgi.http.whiteboard.servlet.pattern=/auditlog/*
 name = auditlog
 authentication.enabled = false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.obr.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/obr
+osgi.http.whiteboard.servlet.pattern=/obr/*
 authentication.enabled = false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/replication
+osgi.http.whiteboard.servlet.pattern=/replication/*
 authentication.enabled = false

Modified: ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg (original)
+++ ace/trunk/run-server-allinone/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/repository
+osgi.http.whiteboard.servlet.pattern=/repository/*
 authentication.enabled = false

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=1731826&r1=1731825&r2=1731826&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 Tue Feb 23 10:05:26 2016
@@ -2,7 +2,7 @@
 
 # The endpoint of the Vaadin UI
 org.apache.ace.server.servlet.init.productionMode = true
-org.apache.ace.server.servlet.endpoint = /ace
+osgi.http.whiteboard.servlet.pattern = /ace/*
 # Vaadin UI settings
 ui.authentication.enabled = true
 ui.authentication.user.name = dd

Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Tue Feb 23 10:05:26 2016
@@ -2,7 +2,8 @@
 
 -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,\
@@ -35,7 +36,6 @@
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.http.redirector;version=latest,\
 	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.log.server.servlet;version=latest,\

Modified: ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.agent.cfg Tue Feb 23 10:05:26 2016
@@ -1,6 +1,6 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/agent
+osgi.http.whiteboard.servlet.pattern=/agent/*
 # OBR settings
 obr.url = http://${org.apache.ace.obr}/obr/
 authentication.enabled = false

Modified: ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.deployment.servlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/deployment
+osgi.http.whiteboard.servlet.pattern=/deployment/*
 authentication.enabled = false

Modified: ace/trunk/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.log.server.servlet.factory/auditlog.cfg Tue Feb 23 10:05:26 2016
@@ -1,5 +1,5 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/auditlog
+osgi.http.whiteboard.servlet.pattern=/auditlog/*
 name = auditlog
 authentication.enabled = false

Modified: ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryReplicationServlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/replication
+osgi.http.whiteboard.servlet.pattern=/replication/*
 authentication.enabled = false

Modified: ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg (original)
+++ ace/trunk/run-server/conf/org.apache.ace.repository.servlet.RepositoryServlet.cfg Tue Feb 23 10:05:26 2016
@@ -1,4 +1,4 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
-org.apache.ace.server.servlet.endpoint=/repository
+osgi.http.whiteboard.servlet.pattern=/repository/*
 authentication.enabled = false

Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1731826&r1=1731825&r2=1731826&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Tue Feb 23 10:05:26 2016
@@ -27,7 +27,6 @@
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.verifier.impl;version=latest,\
-	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.log.server.servlet;version=latest,\
 	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\



Mime
View raw message