Author: cziegeler
Date: Mon Apr 27 14:22:43 2015
New Revision: 1676273
URL: http://svn.apache.org/r1676273
Log:
Update to latest http whiteboard api
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PerContextHandlerRegistry.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRegistry.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PerContextHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PerContextHandlerRegistry.java?rev=1676273&r1=1676272&r2=1676273&view=diff
==============================================================================
---
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PerContextHandlerRegistry.java
(original)
+++
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/PerContextHandlerRegistry.java
Mon Apr 27 14:22:43 2015
@@ -17,7 +17,7 @@
package org.apache.felix.http.base.internal.handler;
import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_EXCEPTION_ON_INIT;
-import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SERVICE_ALREAY_USED;
+import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SERVICE_IN_USE;
import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SHADOWED_BY_OTHER_SERVICE;
import java.util.ArrayList;
@@ -113,7 +113,7 @@ public final class PerContextHandlerRegi
{
if (this.filterMapping.contains(handler))
{
- throw new RegistrationFailureException(handler.getFilterInfo(),
FAILURE_REASON_SERVICE_ALREAY_USED,
+ throw new RegistrationFailureException(handler.getFilterInfo(),
FAILURE_REASON_SERVICE_IN_USE,
"Filter instance " + handler.getName() + " already
registered");
}
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRegistry.java?rev=1676273&r1=1676272&r2=1676273&view=diff
==============================================================================
---
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRegistry.java
(original)
+++
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/handler/ServletHandlerRegistry.java
Mon Apr 27 14:22:43 2015
@@ -18,7 +18,7 @@ package org.apache.felix.http.base.inter
import static java.util.Arrays.asList;
import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_EXCEPTION_ON_INIT;
-import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SERVICE_ALREAY_USED;
+import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SERVICE_IN_USE;
import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SERVLET_CONTEXT_FAILURE;
import static
org.osgi.service.http.runtime.dto.DTOConstants.FAILURE_REASON_SHADOWED_BY_OTHER_SERVICE;
@@ -90,7 +90,7 @@ final class ServletHandlerRegistry
{
if (this.allServletHandlers.contains(handler))
{
- throw new RegistrationFailureException(handler.getServletInfo(),
FAILURE_REASON_SERVICE_ALREAY_USED,
+ throw new RegistrationFailureException(handler.getServletInfo(),
FAILURE_REASON_SERVICE_IN_USE,
"Servlet instance " + handler.getName() + " already
registered");
}
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java?rev=1676273&r1=1676272&r2=1676273&view=diff
==============================================================================
---
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
(original)
+++
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceFactory.java
Mon Apr 27 14:22:43 2015
@@ -173,10 +173,10 @@ public final class HttpServiceFactory
this.httpServiceProps.clear();
this.httpServiceProps.putAll(props);
- if (
this.httpServiceProps.get(HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE)
!= null )
+ if (
this.httpServiceProps.get(HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT) !=
null )
{
this.httpServiceProps.put(OBSOLETE_REG_PROPERTY_ENDPOINTS,
-
this.httpServiceProps.get(HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE));
+
this.httpServiceProps.get(HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT));
}
if (this.httpServiceReg != null)
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java?rev=1676273&r1=1676272&r2=1676273&view=diff
==============================================================================
---
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
(original)
+++
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
Mon Apr 27 14:22:43 2015
@@ -133,8 +133,8 @@ public final class WhiteboardManager
public void start(final ServletContext context)
{
// TODO set Endpoint
-
this.serviceRuntime.setAttribute(HttpServiceRuntimeConstants.HTTP_SERVICE_ID_ATTRIBUTE,
- this.httpServiceFactory.getHttpServiceServiceId());
+
this.serviceRuntime.setAttribute(HttpServiceRuntimeConstants.HTTP_SERVICE_ID,
+
Collections.singletonList(this.httpServiceFactory.getHttpServiceServiceId()));
this.runtimeServiceReg =
this.bundleContext.registerService(HttpServiceRuntime.class,
serviceRuntime,
this.serviceRuntime.getAttributes());
@@ -229,8 +229,8 @@ public final class WhiteboardManager
if (this.runtimeServiceReg != null)
{
-
this.serviceRuntime.setAttribute(HttpServiceRuntimeConstants.HTTP_SERVICE_ID_ATTRIBUTE,
- this.httpServiceFactory.getHttpServiceServiceId());
+
this.serviceRuntime.setAttribute(HttpServiceRuntimeConstants.HTTP_SERVICE_ID,
+
Collections.singletonList(this.httpServiceFactory.getHttpServiceServiceId()));
this.runtimeServiceReg.setProperties(this.serviceRuntime.getAttributes());
}
}
