Update to the latest OSGi APII20150429-2000I20150429-1330I20150429-1230I20150429-1030I20150429-0800I20150428-2000

7 files changed, 37 insertions, 34 deletions

diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
index 64ec60b3e..502d6fd65 100644
--- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -24,22 +24,23 @@ Export-Package: org.osgi.service.cm; version="1.5",
  org.osgi.service.upnp; version="1.2",
  org.osgi.service.useradmin; version="1.1",
  org.osgi.service.wireadmin; version="1.0.1"
-Import-Package: org.osgi.dto; version=1.0,
- org.osgi.framework; version=1.6,
- org.osgi.service.cm; version="[1.5, 1.6)",
- org.osgi.service.component; version="[1.2, 1.3)",
- org.osgi.service.component.annotations; version="[1.2, 1.3)",
- org.osgi.service.device; version="[1.1, 1.2)",
- org.osgi.service.event; version="[1.3, 1.4)",
- org.osgi.service.http; version="[1.2, 1.3)",
- org.osgi.service.log; version="[1.3, 1.4)",
- org.osgi.service.metatype; version="[1.3, 1.4)",
- org.osgi.service.provisioning; version="[1.2, 1.3)",
- org.osgi.service.upnp; version="[1.2, 1.3)",
- org.osgi.service.useradmin; version="[1.1, 1.2)",
- org.osgi.service.wireadmin; version="[1.0, 1.1)",
- javax.servlet; resolution:="optional",
- javax.servlet.http; resolution:="optional"
+Import-Package: javax.servlet;resolution:=optional,
+ javax.servlet.http;resolution:=optional,
+ org.osgi.dto;version="1.0",
+ org.osgi.framework;version="1.6",
+ org.osgi.framework.dto;version="1.8.0",
+ org.osgi.service.cm;version="[1.5,1.6)",
+ org.osgi.service.component;version="[1.2,1.3)",
+ org.osgi.service.component.annotations;version="[1.2,1.3)",
+ org.osgi.service.device;version="[1.1,1.2)",
+ org.osgi.service.event;version="[1.3,1.4)",
+ org.osgi.service.http;version="[1.2,1.3)",
+ org.osgi.service.log;version="[1.3,1.4)",
+ org.osgi.service.metatype;version="[1.3,1.4)",
+ org.osgi.service.provisioning;version="[1.2,1.3)",
+ org.osgi.service.upnp;version="[1.2,1.3)",
+ org.osgi.service.useradmin;version="[1.1,1.2)",
+ org.osgi.service.wireadmin;version="[1.0,1.1)"
 DynamicImport-Package: javax.servlet,
  javax.servlet.http
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/RuntimeDTO.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/RuntimeDTO.java
index 6facc3683..549bf4354 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/RuntimeDTO.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/runtime/dto/RuntimeDTO.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.
@@ -16,8 +16,8 @@
 
 package org.osgi.service.http.runtime.dto;
 
-import java.util.Map;
 import org.osgi.dto.DTO;
+import org.osgi.framework.dto.ServiceReferenceDTO;
 
 /**
  * Represents the state of a Http Service Runtime.
@@ -28,9 +28,11 @@ import org.osgi.dto.DTO;
 public class RuntimeDTO extends DTO {
 
 	/**
-	 * The runtime attributes. This value is never {@code null}.
+	 * The DTO for the corresponding
+	 * {@code org.osgi.service.http.runtime.HttpServiceRuntime}. This value is
+	 * never {@code null}.
 	 */
-	public Map<String, String>	attributes;
+	public ServiceReferenceDTO			serviceDTO;
 
 	/**
 	 * Returns the representations of the {@code javax.servlet.ServletContext}
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPEventListener.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPEventListener.java
index 0daf43c61..80582d96d 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPEventListener.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/upnp/UPnPEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -40,8 +40,8 @@ import java.util.Dictionary;
  * The filter is specified in a property named "upnp.filter" and has as a value
  * an object of type {@code org.osgi.framework.Filter}.
  * <p>
- * When the Filter is evaluated, the folowing keywords are recognized as defined
- * as literal constants in the {@code UPnPDevice} class.
+ * When the Filter is evaluated, the following keywords are recognized as
+ * defined as literal constants in the {@code UPnPDevice} class.
  * <p>
  * The valid subset of properties for the registration of UPnP Event Listener
  * services are:
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Consumer.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Consumer.java
index 3363ead47..2f7f64f30 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Consumer.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Consumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -17,7 +17,7 @@
 package org.osgi.service.wireadmin;
 
 /**
- * Data Consumer, a service that can receive udpated values from
+ * Data Consumer, a service that can receive updated values from
  * {@link Producer} services.
  * 
  * <p>
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Producer.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Producer.java
index a65183e1e..670e883c5 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Producer.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/Producer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -76,7 +76,7 @@ public interface Producer {
 	 * Consumer service calling the {@code Wire} object's {@code poll} method.
 	 * The Producer should coerce the value to be an instance of one of the
 	 * types specified by {@link Wire#getFlavors()}. The types are specified in
-	 * order of of preference. The returned value should be as new or newer than
+	 * order of preference. The returned value should be as new or newer than
 	 * the last value furnished by this object.
 	 * 
 	 * <p>
@@ -85,8 +85,8 @@ public interface Producer {
 	 * (via the {@link #consumersConnected(Wire[])} method).
 	 * <p>
 	 * If the Producer service returns an {@code Envelope} object that has an
-	 * unpermitted scope name, then the Wire object must ignore (or remove) the
-	 * transfer.
+	 * impermissible scope name, then the Wire object must ignore (or remove)
+	 * the transfer.
 	 * <p>
 	 * If the {@code Wire} object has a scope set, the return value must be an
 	 * array of {@code Envelope} objects ({@code Envelope[]}). The {@code Wire}
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
index 12b9e446d..6c5f7a39c 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WireConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -118,9 +118,9 @@ public interface WireConstants {
 	 * same rate that the Producer service can generate data. This property can
 	 * be used to control the delivery rate.
 	 * <p>
-	 * The filter can use a number of pre-defined attributes that can be used to
+	 * The filter can use a number of predefined attributes that can be used to
 	 * control the delivery of new data values. If the filter produces a match
-	 * upon the wire filter attributes, the Consumer service should be notifed
+	 * upon the wire filter attributes, the Consumer service should be notified
 	 * of the updated data value.
 	 * <p>
 	 * If the Producer service was registered with the
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WirePermission.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WirePermission.java
index 99a7e308b..ecf1b5fa8 100644
--- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WirePermission.java
+++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/WirePermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) OSGi Alliance (2002, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 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.
@@ -238,7 +238,7 @@ final public class WirePermission extends BasicPermission {
 	}
 
 	/**
-	 * Determines the equalty of two {@code WirePermission} objects.
+	 * Determines the equality of two {@code WirePermission} objects.
 	 * 
 	 * Checks that specified object has the same name and actions as this
 	 * {@code WirePermission} object.