Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2005-05-16 23:08:00 +0000
committerThomas Watson2005-05-16 23:08:00 +0000
commitd102efddf17c58b7ed584fda2e17f451ca8cd095 (patch)
tree6c30814d3dc1860cdd6c5dc4da4bf54c9c8cb197
parent7d4f1a53a711f337c79d988fa027f9b6eea620e5 (diff)
downloadrt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.tar.gz
rt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.tar.xz
rt.equinox.framework-d102efddf17c58b7ed584fda2e17f451ca8cd095.zip
Bug 90052 OSGI License Needs Clarification
- updated osgi packages with the EPL header. - new about.html
-rw-r--r--bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF35
-rw-r--r--bundles/org.eclipse.osgi.services/about.html39
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$StopperThread.classbin0 -> 855 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$SuspenderThread.classbin0 -> 861 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet.classbin0 -> 6270 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationAdminPermission.classbin0 -> 654 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor$Delegate.classbin0 -> 646 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor.classbin0 -> 4255 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle$Delegate.classbin0 -> 465 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle.classbin0 -> 2638 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/ScheduledApplication.classbin0 -> 403 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/SingletonException.classbin0 -> 549 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor$Delegate.classbin0 -> 613 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor.classbin0 -> 2243 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle$Delegate.classbin0 -> 622 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle.classbin0 -> 2555 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.classbin532 -> 532 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.classbin743 -> 743 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.classbin0 -> 1104 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.classbin698 -> 1534 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationListener.classbin0 -> 218 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.classbin0 -> 3930 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.classbin0 -> 2768 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.classbin314 -> 366 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.classbin246 -> 246 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.classbin361 -> 361 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentConstants.classbin0 -> 456 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentContext.classbin0 -> 677 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentException.classbin0 -> 1070 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentFactory.classbin0 -> 235 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentInstance.classbin0 -> 211 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdmin.classbin0 -> 541 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdminPermission.classbin0 -> 4418 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentException.classbin0 -> 1707 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentPackage.classbin0 -> 892 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentSession.classbin0 -> 347 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/ResourceProcessor.classbin0 -> 542 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.classbin303 -> 303 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.classbin201 -> 201 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.classbin311 -> 311 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.classbin312 -> 312 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.classbin280 -> 280 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.classbin207 -> 207 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/Dmt.classbin0 -> 850 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAcl.classbin0 -> 9176 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAdmin.classbin0 -> 516 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAlertItem.classbin0 -> 1214 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtData.classbin0 -> 3956 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtDataPlugin.classbin0 -> 326 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtException.classbin0 -> 4442 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtExecPlugin.classbin0 -> 283 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtMetaNode.classbin0 -> 830 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermission.classbin0 -> 3451 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermissionCollection.classbin0 -> 2057 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPrincipalPermission.classbin0 -> 856 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnly.classbin0 -> 811 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnlyDataPlugin.classbin0 -> 318 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtSession.classbin0 -> 855 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/Event.classbin0 -> 3608 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/EventAdmin.classbin0 -> 200 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/EventConstants.classbin0 -> 266 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/EventHandler.classbin0 -> 186 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermission.classbin0 -> 4178 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermissionCollection.classbin0 -> 2732 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.classbin689 -> 689 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.classbin597 -> 597 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.classbin507 -> 1013 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.classbin349 -> 349 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.classbin857 -> 857 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.classbin659 -> 0 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.classbin384 -> 384 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.classbin209 -> 209 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.classbin272 -> 272 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.classbin529 -> 529 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.classbin795 -> 820 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeInformation.classbin0 -> 314 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.classbin309 -> 309 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeService.classbin0 -> 355 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.classbin523 -> 523 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorAdmin.classbin0 -> 1001 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorListener.classbin0 -> 219 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorPermission.classbin0 -> 4975 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/Monitorable.classbin0 -> 517 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitoringJob.classbin0 -> 339 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/monitor/StatusVariable.classbin0 -> 5770 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.classbin1146 -> 1146 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.classbin490 -> 533 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.classbin1605 -> 1605 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.classbin311 -> 311 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.classbin0 -> 606 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.classbin345 -> 345 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPLocalStateVariable.classbin0 -> 243 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.classbin632 -> 632 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.classbin1456 -> 1456 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.classbin260 -> 260 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.classbin356 -> 356 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.classbin337 -> 405 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.classbin273 -> 273 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.classbin668 -> 668 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.classbin872 -> 1048 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.classbin213 -> 213 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.classbin4607 -> 5690 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.classbin2141 -> 2782 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.classbin707 -> 882 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.classbin268 -> 268 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.classbin236 -> 236 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.classbin266 -> 266 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.classbin445 -> 445 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.classbin531 -> 531 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.classbin1244 -> 1460 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.classbin216 -> 216 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.classbin1522 -> 1555 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.classbin3565 -> 4440 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.classbin2121 -> 2742 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/src.zipbin124733 -> 199440 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF15
-rw-r--r--bundles/org.eclipse.osgi.util/about.html39
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.classbin0 -> 2086 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.classbin0 -> 2078 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.classbin3557 -> 5254 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.classbin1251 -> 1622 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.classbin6130 -> 8270 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.classbin0 -> 2664 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.classbin0 -> 441 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.classbin0 -> 3348 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.classbin2660 -> 3103 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.classbin6302 -> 8254 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/src.zipbin20037 -> 26525 bytes
128 files changed, 104 insertions, 24 deletions
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
index deaf093ac..c6ded20cc 100644
--- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -1,23 +1,30 @@
Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
Bundle-Name: %osgiServices
Bundle-SymbolicName: org.eclipse.osgi.services
-Bundle-Version: 3.0.0
+Bundle-Version: 3.1.0
Bundle-Description: %osgiServicesDes
Bundle-Localization: plugin
Bundle-Vendor: %eclipse.org
Bundle-DocUrl: http://www.eclipse.org
Bundle-ContactAddress: www.eclipse.org
Bundle-Copyright: %copyright
-Bundle-ManifestVersion: 2
-Export-Package: org.osgi.service.cm; specification-version=1.1,
- org.osgi.service.device; specification-version=1.1,
- org.osgi.service.http; specification-version=1.1,
- org.osgi.service.io; specification-version=1.0,
- org.osgi.service.jini; specification-version=1.0,
- org.osgi.service.log; specification-version=1.2,
- org.osgi.service.metatype; specification-version=1.0,
- org.osgi.service.provisioning; specification-version=1.0,
- org.osgi.service.upnp; specification-version=1.0,
- org.osgi.service.useradmin; specification-version=1.0,
- org.osgi.service.wireadmin; specification-version=1.0
-Import-Package: org.osgi.framework; specification-version=1.2
+Export-Package: org.osgi.meglet; version="1.0",
+ org.osgi.service.application; version="1.0",
+ org.osgi.service.application.meglet; version="1.0",
+ org.osgi.service.cm; version="1.2",
+ org.osgi.service.component; version="1.0",
+ org.osgi.service.deploymentadmin; version="1.0",
+ org.osgi.service.device; version="1.1",
+ org.osgi.service.dmt; version="1.0",
+ org.osgi.service.event; version="1.0",
+ org.osgi.service.http; version="1.2",
+ org.osgi.service.io; version="1.0",
+ org.osgi.service.log; version="1.2",
+ org.osgi.service.metatype; version="1.1",
+ org.osgi.service.monitor; version="1.0",
+ org.osgi.service.provisioning; version="1.0",
+ org.osgi.service.upnp; version="1.1",
+ org.osgi.service.useradmin; version="1.0",
+ org.osgi.service.wireadmin; version="1.0"
+Import-Package: org.osgi.framework; version=1.2
diff --git a/bundles/org.eclipse.osgi.services/about.html b/bundles/org.eclipse.osgi.services/about.html
index 6f6b96c4c..63e100397 100644
--- a/bundles/org.eclipse.osgi.services/about.html
+++ b/bundles/org.eclipse.osgi.services/about.html
@@ -6,8 +6,8 @@
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
+
+<p>May 16, 2005</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
@@ -18,5 +18,40 @@ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as follows:</p>
+
+<p><b>OSGi Materials</b></p>
+
+<p>All files in the following sub-directories (and their sub-directories):</p>
+
+<ul>
+ <li>org/osgi</li>
+</ul>
+
+<p>shall be defined as the &quot;OSGi Materials.&quot; The OSGi Materials are:</p>
+
+<blockquote>
+Copyright (c) 2000, 2005
+<br /><br />
+OSGi Alliance
+Bishop Ranch 6<br/>
+2400 Camino Ramon, Suite 375<br/>
+San Ramon, CA 94583 USA
+<br /><br />
+All Rights Reserved.
+</blockquote>
+
+<p>The OSGi Materials are provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). For purposes of the EPL, &quot;Program&quot; will mean the OSGi Materials.</p>
+
+<p>Implementation of certain elements of the OSGi Materials may be subject to third party intellectual property rights, including without limitation, patent rights (such a third party may
+or may not be a member of the OSGi Alliance). The OSGi Alliance is not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party
+intellectual property rights.</p>
+
+<small>OSGi&trade; is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark,
+registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or
+service marks used in the Content are the property of their respective owners and are hereby recognized.</small>
</body>
</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$StopperThread.class b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$StopperThread.class
new file mode 100644
index 000000000..f40d1528c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$StopperThread.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$SuspenderThread.class b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$SuspenderThread.class
new file mode 100644
index 000000000..43c6e0c08
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet$1$SuspenderThread.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet.class b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet.class
new file mode 100644
index 000000000..e2af2364f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/meglet/Meglet.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationAdminPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationAdminPermission.class
new file mode 100644
index 000000000..da7e12754
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationAdminPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor$Delegate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor$Delegate.class
new file mode 100644
index 000000000..e7eb373d1
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor$Delegate.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor.class
new file mode 100644
index 000000000..b94e872cb
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationDescriptor.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle$Delegate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle$Delegate.class
new file mode 100644
index 000000000..2d0fdbae2
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle$Delegate.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle.class
new file mode 100644
index 000000000..394de6a51
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ApplicationHandle.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/ScheduledApplication.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ScheduledApplication.class
new file mode 100644
index 000000000..71d4846eb
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/ScheduledApplication.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/SingletonException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/SingletonException.class
new file mode 100644
index 000000000..78188203d
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/SingletonException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor$Delegate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor$Delegate.class
new file mode 100644
index 000000000..444f76f7e
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor$Delegate.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor.class
new file mode 100644
index 000000000..a82f926f2
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletDescriptor.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle$Delegate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle$Delegate.class
new file mode 100644
index 000000000..ea0731a29
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle$Delegate.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle.class b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle.class
new file mode 100644
index 000000000..3ff85d6ae
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/application/meglet/MegletHandle.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.class
index 58648024c..f6e999d68 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.class
index 0e2fb8945..f1cf4502d 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.class
new file mode 100644
index 000000000..5a75a8878
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.class
index 705feeb0a..17770f6a3 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationListener.class
new file mode 100644
index 000000000..dfd64a031
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.class
new file mode 100644
index 000000000..d19df62a4
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.class
new file mode 100644
index 000000000..ff3b2a4ce
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.class
index 01b2c515e..007280593 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.class
index 5cfd6c459..472988445 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.class
index f068a1841..078955281 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentConstants.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentConstants.class
new file mode 100644
index 000000000..5daf2f468
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentConstants.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentContext.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentContext.class
new file mode 100644
index 000000000..1e5ce1765
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentContext.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentException.class
new file mode 100644
index 000000000..928dc9c5f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentFactory.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentFactory.class
new file mode 100644
index 000000000..cd4f8e161
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentFactory.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentInstance.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentInstance.class
new file mode 100644
index 000000000..8e64f641b
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/ComponentInstance.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdmin.class
new file mode 100644
index 000000000..d3210d50f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdminPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdminPermission.class
new file mode 100644
index 000000000..10e7469bf
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentAdminPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentException.class
new file mode 100644
index 000000000..7949f8bcf
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentPackage.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentPackage.class
new file mode 100644
index 000000000..be4f3da23
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentPackage.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentSession.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentSession.class
new file mode 100644
index 000000000..c78ff2172
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/DeploymentSession.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/ResourceProcessor.class b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/ResourceProcessor.class
new file mode 100644
index 000000000..182cb8a38
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/deploymentadmin/ResourceProcessor.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.class
index 9bf7a059e..26ea99f37 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.class
index 029c4c010..b03e83e0f 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.class
index 764fde5c7..58c778c81 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.class
index 31a8743dd..ac75cf11a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.class
index c2a65c4a7..d87cc0f6b 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.class
index 4bb481760..81c473710 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/Dmt.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/Dmt.class
new file mode 100644
index 000000000..113833a5b
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/Dmt.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAcl.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAcl.class
new file mode 100644
index 000000000..d45a833ff
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAcl.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAdmin.class
new file mode 100644
index 000000000..9bf0539bc
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAlertItem.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAlertItem.class
new file mode 100644
index 000000000..d59e841d4
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtAlertItem.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtData.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtData.class
new file mode 100644
index 000000000..394e344cc
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtData.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtDataPlugin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtDataPlugin.class
new file mode 100644
index 000000000..49d2d7654
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtDataPlugin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtException.class
new file mode 100644
index 000000000..9a4923f2f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtExecPlugin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtExecPlugin.class
new file mode 100644
index 000000000..60ea90633
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtExecPlugin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtMetaNode.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtMetaNode.class
new file mode 100644
index 000000000..222859333
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtMetaNode.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermission.class
new file mode 100644
index 000000000..66953c433
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermissionCollection.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermissionCollection.class
new file mode 100644
index 000000000..cf51e1722
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPrincipalPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPrincipalPermission.class
new file mode 100644
index 000000000..93663c223
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtPrincipalPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnly.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnly.class
new file mode 100644
index 000000000..8271bbb72
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnly.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnlyDataPlugin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnlyDataPlugin.class
new file mode 100644
index 000000000..faad97d83
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtReadOnlyDataPlugin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtSession.class b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtSession.class
new file mode 100644
index 000000000..1f016e403
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/dmt/DmtSession.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/Event.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/Event.class
new file mode 100644
index 000000000..3070621e2
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/Event.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventAdmin.class
new file mode 100644
index 000000000..5f6ea337e
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventConstants.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventConstants.class
new file mode 100644
index 000000000..0289f6241
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventConstants.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventHandler.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventHandler.class
new file mode 100644
index 000000000..c1f1e06d3
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/EventHandler.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermission.class
new file mode 100644
index 000000000..f078dae6b
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermissionCollection.class b/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermissionCollection.class
new file mode 100644
index 000000000..2909aa044
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/event/TopicPermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.class b/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.class
index 1ec1cbc7c..12f552e28 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.class
index 47b348ba5..483d8cdcf 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.class
index d2eb84ebd..9d484dfc9 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.class b/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.class
index aa331926c..bc6caa535 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.class
index c5863bbaa..567c68453 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.class b/bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.class
deleted file mode 100644
index c48489d55..000000000
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.class
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.class b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.class
index ee992fef2..164ad6e5e 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.class
index 193295300..5f47eb21a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.class
index e1a96f283..1863869de 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.class
index 6ffee72ac..5a0c0b61b 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.class
index e2f780e1c..ba77b6b41 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeInformation.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeInformation.class
new file mode 100644
index 000000000..28a5795d5
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeInformation.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.class
index a20c2ba84..d51f35bce 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeService.class
new file mode 100644
index 000000000..27b0e9e60
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.class
index 84da92f36..e376eed1a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorAdmin.class
new file mode 100644
index 000000000..745c24348
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorListener.class
new file mode 100644
index 000000000..66d0917a4
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorPermission.class
new file mode 100644
index 000000000..8dd2b365f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitorPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/Monitorable.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/Monitorable.class
new file mode 100644
index 000000000..0dd568041
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/Monitorable.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitoringJob.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitoringJob.class
new file mode 100644
index 000000000..179bc9e40
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/MonitoringJob.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/StatusVariable.class b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/StatusVariable.class
new file mode 100644
index 000000000..9a5e0bf19
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/monitor/StatusVariable.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.class
index 40c497f6f..0a0777ad8 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.class
index d2d5c52d8..85ff82a36 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.class
index e722c9b9b..40f43ce5e 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.class
index e35d8dbca..35c7cef7f 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.class
new file mode 100644
index 000000000..b67896011
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.class
index 12584cff4..11d1adf9a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPLocalStateVariable.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPLocalStateVariable.class
new file mode 100644
index 000000000..8d2668676
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPLocalStateVariable.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.class
index 1f615fcc4..8aa01a9bf 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.class
index 99dff97b7..a5a7d1a71 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.class
index 7a3a62c1d..94237c249 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.class
index 1f4397aef..75d800951 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.class
index 394192f26..7ef8519c3 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.class
index e5803635a..acd521fc5 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.class
index 466846d05..c214031ac 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.class
index 94b0034a3..8e42f39d0 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.class
index f99288f18..0744fa727 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.class
index e528b3bd7..dc02425aa 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.class b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.class
index cb5db25ff..f67b387f0 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.class
index 52aa700c4..2e260dbca 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.class
index e1fbe8970..cd9c59815 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.class
index db35904a6..823099a9a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.class
index 0cb245835..64b2c2184 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.class
index 174944fab..e80bd4c9e 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.class
index 8fdb64a28..8723c678a 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.class
index 172198912..b4d857352 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.class
index 7399b19c7..e5a6699d5 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.class
index 0c95dd6ad..0484bda7e 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.class
index 359ec760b..26d72598d 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.class b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.class
index 4895d2910..580507a88 100644
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.class
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/src.zip b/bundles/org.eclipse.osgi.services/src.zip
index 5edd563e3..e47c6884e 100644
--- a/bundles/org.eclipse.osgi.services/src.zip
+++ b/bundles/org.eclipse.osgi.services/src.zip
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
index 0e84708cc..8a2d0da55 100644
--- a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
@@ -1,15 +1,18 @@
Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
Bundle-Name: %osgiUtil
Bundle-SymbolicName: org.eclipse.osgi.util
-Bundle-Version: 3.0.0
+Bundle-Version: 3.1.0
Bundle-Description: %osgiUtilDes
Bundle-Vendor: %eclipse.org
Bundle-Localization: plugin
Bundle-DocUrl: http://www.eclipse.org
Bundle-ContactAddress: www.eclipse.org
Bundle-Copyright: %copyright
-Bundle-ManifestVersion: 2
-Export-Package: org.osgi.util.measurement; specification-version=1.0,
- org.osgi.util.position; specification-version=1.0,
- org.osgi.util.xml; specification-version=1.0
-Import-Package: org.osgi.framework; specification-version=1.1
+Export-Package: org.osgi.util.gsm; version="1.0",
+ org.osgi.util.measurement; version="1.1",
+ org.osgi.util.mobile; version="1.0",
+ org.osgi.util.position; version="1.0",
+ org.osgi.util.xml; version="1.0"
+Import-Package: org.osgi.framework; version=1.1,
+ org.osgi.service.condpermadmin
diff --git a/bundles/org.eclipse.osgi.util/about.html b/bundles/org.eclipse.osgi.util/about.html
index 6f6b96c4c..63e100397 100644
--- a/bundles/org.eclipse.osgi.util/about.html
+++ b/bundles/org.eclipse.osgi.util/about.html
@@ -6,8 +6,8 @@
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
+
+<p>May 16, 2005</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
@@ -18,5 +18,40 @@ For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as follows:</p>
+
+<p><b>OSGi Materials</b></p>
+
+<p>All files in the following sub-directories (and their sub-directories):</p>
+
+<ul>
+ <li>org/osgi</li>
+</ul>
+
+<p>shall be defined as the &quot;OSGi Materials.&quot; The OSGi Materials are:</p>
+
+<blockquote>
+Copyright (c) 2000, 2005
+<br /><br />
+OSGi Alliance
+Bishop Ranch 6<br/>
+2400 Camino Ramon, Suite 375<br/>
+San Ramon, CA 94583 USA
+<br /><br />
+All Rights Reserved.
+</blockquote>
+
+<p>The OSGi Materials are provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). For purposes of the EPL, &quot;Program&quot; will mean the OSGi Materials.</p>
+
+<p>Implementation of certain elements of the OSGi Materials may be subject to third party intellectual property rights, including without limitation, patent rights (such a third party may
+or may not be a member of the OSGi Alliance). The OSGi Alliance is not responsible and shall not be held responsible in any manner for identifying or failing to identify any or all such third party
+intellectual property rights.</p>
+
+<small>OSGi&trade; is a trademark, registered trademark, or service mark of The OSGi Alliance in the US and other countries. Java is a trademark,
+registered trademark, or service mark of Sun Microsystems, Inc. in the US and other countries. All other trademarks, registered trademarks, or
+service marks used in the Content are the property of their respective owners and are hereby recognized.</small>
</body>
</html> \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class
new file mode 100644
index 000000000..d1830d6a8
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMEICondition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class
new file mode 100644
index 000000000..6956fdaf8
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/gsm/IMSICondition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class
index 9e0626564..9149e0639 100644
--- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class
index 822b26aea..a64e31170 100644
--- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class
index a464197c1..ddbc81ea6 100644
--- a/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class
new file mode 100644
index 000000000..25f50d4ae
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/TransferCostCondition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class
new file mode 100644
index 000000000..6799b017b
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition$UserPromptConditionFactory.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class
new file mode 100644
index 000000000..e552b3be3
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/mobile/UserPromptCondition.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class b/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class
index 1909757c8..4a1cdf1a9 100644
--- a/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class b/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class
index 5a18b4fde..86fe05480 100644
--- a/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/src.zip b/bundles/org.eclipse.osgi.util/src.zip
index 109863747..7823ab260 100644
--- a/bundles/org.eclipse.osgi.util/src.zip
+++ b/bundles/org.eclipse.osgi.util/src.zip
Binary files differ

Back to the top