Update the OSGi API to the latest

3 files changed, 9 insertions, 8 deletions

diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java
index 21f874cde..77f1c5de5 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/HttpServiceRuntimeConstants.java
@@ -50,15 +50,16 @@ public final class HttpServiceRuntimeConstants {
 
 	/**
 	 * Http Runtime Service registration property to associate the Http Runtime
-	 * Service with a Http Service implementation.
+	 * Service with one or more Http Service registrations.
 	 * 
 	 * <p>
 	 * If this Http Whiteboard implementation also implements the Http Service
-	 * Specification this property is set to the {@code service.id} of the
-	 * {@code HttpService} provided by this implementation.
+	 * Specification this property is set to a collection of {@code service.id}
+	 * for the {@code HttpService} registrations provided by this
+	 * implementation.
 	 * 
 	 * <p>
-	 * The value of this attribute must be of type {@code Integer}.
+	 * The value of this attribute must be of type {@code Collection<Integer>}.
 	 */
 	public static final String	HTTP_SERVICE_ID_ATTRIBUTE		= "osgi.http.service.id";
 }
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/ServletContextDTO.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/ServletContextDTO.java
index 38898c22c..51af19570 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/ServletContextDTO.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/ServletContextDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2015). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
index 2c9b7de2c..dd4a0f8f2 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/whiteboard/HttpWhiteboardConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2015). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,8 +181,8 @@ public final class HttpWhiteboardConstants {
 	 * <p>
 	 * The service property values may be the name of a fully qualified
 	 * exception class, a three digit HTTP status code, the value "4xx" for all
-	 * error codes in the 400 rage, or the value "5xx" for all error codes in
-	 * the 500 rage. Any value that is not a three digit number, or one of the
+	 * error codes in the 400 range, or the value "5xx" for all error codes in
+	 * the 500 range. Any value that is not a three digit number, or one of the
 	 * two special values is considered to be the name of a fully qualified
 	 * exception class.
 	 *