You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/01/29 11:34:28 UTC

[3/3] aries-jax-rs-whiteboard git commit: Harmonize capitalization

Harmonize capitalization


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f2b2bf18
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f2b2bf18
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f2b2bf18

Branch: refs/heads/master
Commit: f2b2bf18770d044f0c7e528a8533f18be1b564ae
Parents: efcc043
Author: Carlos Sierra <cs...@apache.org>
Authored: Mon Jan 29 12:27:34 2018 +0100
Committer: Carlos Sierra <cs...@apache.org>
Committed: Mon Jan 29 12:27:34 2018 +0100

----------------------------------------------------------------------
 .../aries/jax/rs/example/ExampleAddon.java      |  6 +++---
 .../aries/jax/rs/example/ExampleFilter.java     |  6 +++---
 jax-rs.itests/src/main/java/test/JaxrsTest.java | 16 ++++++++--------
 .../main/java/test/WhiteboardFactoryTest.java   | 16 ++++++++--------
 .../java/test/WhiteboardTargetFilterTest.java   | 15 ++++++++-------
 .../src/main/java/test/types/TestHelper.java    | 11 ++++++-----
 .../internal/AriesJaxRSServiceRuntime.java      | 10 +++++-----
 .../rs/whiteboard/internal/TargetFilter.java    |  2 +-
 .../jax/rs/whiteboard/internal/Whiteboard.java  | 20 ++++++++++----------
 9 files changed, 52 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
index 2104504..f6b7c38 100644
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleAddon.java
@@ -18,7 +18,7 @@
 package org.apache.aries.jax.rs.example;
 
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
+import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,8 +30,8 @@ import javax.ws.rs.core.UriInfo;
 
 @Component(
     property = {
-        JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
-        JaxRSWhiteboardConstants.JAX_RS_RESOURCE + "=true"
+        JaxrsWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
+        JaxrsWhiteboardConstants.JAX_RS_RESOURCE + "=true"
     },
     service = ExampleAddon.class
 )

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
index 2ab0997..81e7674 100644
--- a/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
+++ b/jax-rs.example/src/main/java/org/apache/aries/jax/rs/example/ExampleFilter.java
@@ -18,7 +18,7 @@
 package org.apache.aries.jax.rs.example;
 
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
+import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,8 +31,8 @@ import java.io.IOException;
 
 @Component(
     property = {
-        JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
-        JaxRSWhiteboardConstants.JAX_RS_EXTENSION + "=true"
+        JaxrsWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
+        JaxrsWhiteboardConstants.JAX_RS_EXTENSION + "=true"
     }
 )
 @Provider

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.itests/src/main/java/test/JaxrsTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 2248356..9bb74c7 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -19,7 +19,7 @@ package test;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertTrue;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.*;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -47,7 +47,7 @@ import org.osgi.framework.PrototypeServiceFactory;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
 
-import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
 import org.osgi.service.jaxrs.runtime.dto.ApplicationDTO;
 import org.osgi.service.jaxrs.runtime.dto.DTOConstants;
 import org.osgi.service.jaxrs.runtime.dto.FailedApplicationDTO;
@@ -264,7 +264,7 @@ public class JaxrsTest extends TestHelper {
     public void testApplicationOverride() throws InterruptedException {
         WebTarget webTarget = createDefaultTarget().path("test-application");
 
-        JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
+        JaxrsServiceRuntime runtime = getJaxrsServiceRuntime();
 
         ServiceRegistration<?> serviceRegistration2;
 
@@ -1342,7 +1342,7 @@ public class JaxrsTest extends TestHelper {
 
         WebTarget webTarget = createDefaultTarget().path("test");
 
-        JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
+        JaxrsServiceRuntime runtime = getJaxrsServiceRuntime();
 
         ServiceRegistration<?> serviceRegistration;
         ServiceRegistration<?> extensionRegistration1;
@@ -1437,7 +1437,7 @@ public class JaxrsTest extends TestHelper {
     public void testStandaloneFilter() throws InterruptedException {
         WebTarget webTarget = createDefaultTarget().path("test");
 
-        JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
+        JaxrsServiceRuntime runtime = getJaxrsServiceRuntime();
 
         RuntimeDTO runtimeDTO = runtime.getRuntimeDTO();
 
@@ -1509,7 +1509,7 @@ public class JaxrsTest extends TestHelper {
     public void testUngettableExtension() throws InterruptedException {
         WebTarget webTarget = createDefaultTarget().path("test");
 
-        JaxRSServiceRuntime runtime = getJaxRSServiceRuntime();
+        JaxrsServiceRuntime runtime = getJaxrsServiceRuntime();
 
         RuntimeDTO runtimeDTO = runtime.getRuntimeDTO();
 
@@ -1565,11 +1565,11 @@ public class JaxrsTest extends TestHelper {
             Arrays.stream(getter.apply(getRuntimeDTO())).anyMatch(predicate));
     }
 
-    private JaxRSServiceRuntime getJaxRSServiceRuntime()
+    private JaxrsServiceRuntime getJaxrsServiceRuntime()
         throws InterruptedException {
 
         _runtimeTracker = new ServiceTracker<>(
-            bundleContext, JaxRSServiceRuntime.class, null);
+            bundleContext, JaxrsServiceRuntime.class, null);
 
         _runtimeTracker.open();
 

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java b/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
index b7a4c12..efc8f7d 100644
--- a/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
+++ b/jax-rs.itests/src/main/java/test/WhiteboardFactoryTest.java
@@ -33,7 +33,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
 import org.osgi.util.tracker.ServiceTracker;
 import test.types.TestHelper;
 
@@ -54,12 +54,12 @@ public class WhiteboardFactoryTest extends TestHelper {
         CountDownLatch removedCountLatch = new CountDownLatch(1);
 
         ServiceTracker<?, ?> serviceTracker = new ServiceTracker
-            <JaxRSServiceRuntime, JaxRSServiceRuntime>(
-            bundleContext, JaxRSServiceRuntime.class, null) {
+            <JaxrsServiceRuntime, JaxrsServiceRuntime>(
+            bundleContext, JaxrsServiceRuntime.class, null) {
 
             @Override
-            public JaxRSServiceRuntime addingService(
-                ServiceReference<JaxRSServiceRuntime> reference) {
+            public JaxrsServiceRuntime addingService(
+                ServiceReference<JaxrsServiceRuntime> reference) {
 
                 if ("/new-whiteboard".equals(
                     reference.getProperty(
@@ -75,8 +75,8 @@ public class WhiteboardFactoryTest extends TestHelper {
 
             @Override
             public void removedService(
-                ServiceReference<JaxRSServiceRuntime> reference,
-                JaxRSServiceRuntime service) {
+                ServiceReference<JaxrsServiceRuntime> reference,
+                JaxrsServiceRuntime service) {
 
                 removedCountLatch.countDown();
             }
@@ -87,7 +87,7 @@ public class WhiteboardFactoryTest extends TestHelper {
 
             serviceTracker.open();
 
-            ServiceReference<JaxRSServiceRuntime> serviceReference =
+            ServiceReference<JaxrsServiceRuntime> serviceReference =
                 _runtimeTracker.getServiceReference();
 
             assertNotNull(serviceReference);

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java b/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
index 92853c3..52050cf 100644
--- a/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
+++ b/jax-rs.itests/src/main/java/test/WhiteboardTargetFilterTest.java
@@ -26,7 +26,8 @@ import javax.ws.rs.client.WebTarget;
 
 import org.junit.Test;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
+
+import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
 
 import test.types.TestAddon;
 import test.types.TestHelper;
@@ -42,8 +43,8 @@ public class WhiteboardTargetFilterTest extends TestHelper {
             webTarget.request().get().getStatus());
 
         Dictionary<String, Object> properties = new Hashtable<>();
-        properties.put(JaxRSWhiteboardConstants.JAX_RS_RESOURCE, "true");
-        properties.put(JaxRSWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET, "//");
+        properties.put(JaxrsWhiteboardConstants.JAX_RS_RESOURCE, "true");
+        properties.put(JaxrsWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET, "//");
 
         ServiceRegistration<Object> serviceRegistration =
             bundleContext.registerService(
@@ -68,9 +69,9 @@ public class WhiteboardTargetFilterTest extends TestHelper {
             webTarget.request().get().getStatus());
 
         Dictionary<String, Object> properties = new Hashtable<>();
-        properties.put(JaxRSWhiteboardConstants.JAX_RS_RESOURCE, "true");
+        properties.put(JaxrsWhiteboardConstants.JAX_RS_RESOURCE, "true");
         properties.put(
-            JaxRSWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET,
+            JaxrsWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET,
             "(crazy=the joker)");
 
         ServiceRegistration<Object> serviceRegistration =
@@ -96,9 +97,9 @@ public class WhiteboardTargetFilterTest extends TestHelper {
             webTarget.request().get().getStatus());
 
         Dictionary<String, Object> properties = new Hashtable<>();
-        properties.put(JaxRSWhiteboardConstants.JAX_RS_RESOURCE, "true");
+        properties.put(JaxrsWhiteboardConstants.JAX_RS_RESOURCE, "true");
         properties.put(
-            JaxRSWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET,
+            JaxrsWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET,
             "(service.pid=org.apache.aries.jax.rs.whiteboard.default)");
 
         ServiceRegistration<Object> serviceRegistration =

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.itests/src/main/java/test/types/TestHelper.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestHelper.java b/jax-rs.itests/src/main/java/test/types/TestHelper.java
index c75c3d8..35ad671 100644
--- a/jax-rs.itests/src/main/java/test/types/TestHelper.java
+++ b/jax-rs.itests/src/main/java/test/types/TestHelper.java
@@ -26,7 +26,8 @@ import org.junit.Before;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
 import org.osgi.util.tracker.ServiceTracker;
 
 import java.util.Collection;
@@ -38,12 +39,12 @@ public class TestHelper {
             getBundle(TestHelper.class).
             getBundleContext();
 
-    protected ServiceTracker<JaxRSServiceRuntime, JaxRSServiceRuntime>
+    protected ServiceTracker<JaxrsServiceRuntime, JaxrsServiceRuntime>
         _runtimeTracker;
     protected ServiceTracker<ClientBuilder, ClientBuilder>
         _clientBuilderTracker;
-    protected JaxRSServiceRuntime _runtime;
-    protected ServiceReference<JaxRSServiceRuntime> _runtimeServiceReference;
+    protected JaxrsServiceRuntime _runtime;
+    protected ServiceReference<JaxrsServiceRuntime> _runtimeServiceReference;
 
     @After
     public void after() {
@@ -60,7 +61,7 @@ public class TestHelper {
         _clientBuilderTracker.open();
 
         _runtimeTracker = new ServiceTracker<>(
-            bundleContext, JaxRSServiceRuntime.class, null);
+            bundleContext, JaxrsServiceRuntime.class, null);
 
         _runtimeTracker.open();
 

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
index a3e21d0..69e78b0 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
@@ -22,7 +22,7 @@ import static org.apache.aries.jax.rs.whiteboard.internal.Utils.generateApplicat
 import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.DEFAULT_NAME;
 import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.SUPPORTED_EXTENSION_INTERFACES;
 import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.getApplicationBase;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_NAME;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,7 +40,7 @@ import org.apache.aries.jax.rs.whiteboard.internal.Utils.PropertyHolder;
 import org.apache.aries.jax.rs.whiteboard.internal.introspection.ClassIntrospector;
 import org.apache.aries.osgi.functional.CachingServiceReference;
 import org.apache.cxf.Bus;
-import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
 import org.osgi.service.jaxrs.runtime.dto.ApplicationDTO;
 import org.osgi.service.jaxrs.runtime.dto.BaseDTO;
 import org.osgi.service.jaxrs.runtime.dto.BaseExtensionDTO;
@@ -51,11 +51,11 @@ import org.osgi.service.jaxrs.runtime.dto.FailedExtensionDTO;
 import org.osgi.service.jaxrs.runtime.dto.FailedResourceDTO;
 import org.osgi.service.jaxrs.runtime.dto.ResourceDTO;
 import org.osgi.service.jaxrs.runtime.dto.RuntimeDTO;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
+import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
+public class AriesJaxRSServiceRuntime implements JaxrsServiceRuntime {
 
     private static final long serialVersionUID = 1L;
     private static final Logger _LOGGER = LoggerFactory.getLogger(
@@ -397,7 +397,7 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
         FailedApplicationDTO failedApplicationDTO = new FailedApplicationDTO();
 
         Object nameProperty = serviceReference.getProperty(
-            JaxRSWhiteboardConstants.JAX_RS_NAME);
+            JaxrsWhiteboardConstants.JAX_RS_NAME);
 
         failedApplicationDTO.name = nameProperty == null ?
             generateApplicationName(serviceReference::getProperty) :

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
index 1340989..94708f2 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/TargetFilter.java
@@ -1,6 +1,6 @@
 package org.apache.aries.jax.rs.whiteboard.internal;
 
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_WHITEBOARD_TARGET;
 
 import java.util.function.Predicate;
 

http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f2b2bf18/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 1b3ad2c..7ceacb8 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -34,7 +34,7 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
+import org.osgi.service.jaxrs.runtime.JaxrsServiceRuntime;
 
 import javax.servlet.Servlet;
 import javax.ws.rs.container.ContainerRequestFilter;
@@ -91,14 +91,14 @@ import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHIT
 import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_ASYNC_SUPPORTED;
 import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN;
 import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_TARGET;
-import static org.osgi.service.jaxrs.runtime.JaxRSServiceRuntimeConstants.JAX_RS_SERVICE_ENDPOINT;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_APPLICATION_BASE;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_DEFAULT_APPLICATION;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_EXTENSION;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_EXTENSION_SELECT;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_NAME;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_RESOURCE;
+import static org.osgi.service.jaxrs.runtime.JaxrsServiceRuntimeConstants.JAX_RS_SERVICE_ENDPOINT;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_APPLICATION_BASE;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_APPLICATION_SELECT;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_DEFAULT_APPLICATION;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_EXTENSION_SELECT;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_NAME;
+import static org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants.JAX_RS_RESOURCE;
 
 /**
  * @author Carlos Sierra Andrés
@@ -399,7 +399,7 @@ public class Whiteboard {
         properties.putIfAbsent(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
 
         return _bundleContext.registerService(
-            JaxRSServiceRuntime.class, _runtime, new Hashtable<>(properties));
+            JaxrsServiceRuntime.class, _runtime, new Hashtable<>(properties));
     }
 
     public void removeHttpEndpoints(List<String> endpoints) {