Update the OSGi APIs to the latest for Http Whiteboard
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java
index 747778d..a0fe1f4 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/Activator.java
@@ -133,10 +133,10 @@
}
if (serviceProperties.get(
- HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE) == null) {
+ HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT) == null) {
serviceProperties.put(
- HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE,
+ HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT,
httpServiceEndpoints);
}
@@ -159,7 +159,7 @@
ServiceRegistration<?> hsfRegistration = context.registerService(
HTTP_SERVICES_CLASSES, httpServiceFactory, serviceProperties);
- serviceProperties.put(HttpServiceRuntimeConstants.HTTP_SERVICE_ID_ATTRIBUTE, Collections.singletonList(hsfRegistration.getReference().getProperty(Constants.SERVICE_ID)));
+ serviceProperties.put(HttpServiceRuntimeConstants.HTTP_SERVICE_ID, Collections.singletonList(hsfRegistration.getReference().getProperty(Constants.SERVICE_ID)));
ServiceRegistration<HttpServiceRuntime> hsrRegistration =
context.registerService(
HttpServiceRuntime.class, httpServiceRuntime,
@@ -193,7 +193,7 @@
servletContext.log(
"The http container does not support servlet 3.0+. " +
"Therefore, the value of " +
- HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE +
+ HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT +
" cannot be calculated.");
return new String[0];
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
index 7771eaa..d37bb35 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java
@@ -210,7 +210,7 @@
public List<String> getHttpServiceEndpoints() {
return StringPlus.from(
attributes.get(
- HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE));
+ HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT));
}
@Override
