diff options
| author | Thomas Watson | 2015-04-27 13:26:19 +0000 |
|---|---|---|
| committer | Thomas Watson | 2015-04-27 13:26:19 +0000 |
| commit | 4bb11dc145ce19c84f9c06c46a5ed2c520a1df07 (patch) | |
| tree | 4812720b3181a01294c3900497ef10f22233d4fc /bundles | |
| parent | f545ad375fda9770a8fd2ca708101c453f3e6f3a (diff) | |
| download | rt.equinox.bundles-4bb11dc145ce19c84f9c06c46a5ed2c520a1df07.tar.gz rt.equinox.bundles-4bb11dc145ce19c84f9c06c46a5ed2c520a1df07.tar.xz rt.equinox.bundles-4bb11dc145ce19c84f9c06c46a5ed2c520a1df07.zip | |
Update the OSGi APIs to the latest for Http WhiteboardI20150428-0800I20150428-0100I20150427-2000
Diffstat (limited to 'bundles')
2 files changed, 5 insertions, 5 deletions
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 747778d46..a0fe1f4c8 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 @@ public class Activator } 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 @@ public class Activator 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 @@ public class Activator 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 7771eaa63..d37bb351d 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 class HttpServiceRuntimeImpl public List<String> getHttpServiceEndpoints() { return StringPlus.from( attributes.get( - HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT_ATTRIBUTE)); + HttpServiceRuntimeConstants.HTTP_SERVICE_ENDPOINT)); } @Override |