diff options
author | Thomas Watson | 2011-11-17 12:10:29 +0000 |
---|---|---|
committer | Thomas Watson | 2011-11-17 12:10:29 +0000 |
commit | 0d59d5e22c3e3b6a164e39fe26b0246a3b02f8e7 (patch) | |
tree | 5346655cb7e3c5a361406ef9780e4bf35f593d1d /bundles/org.eclipse.osgi.services | |
parent | 38602d6ab8abeb5e2054765df8680921324d048e (diff) | |
download | rt.equinox.framework-0d59d5e22c3e3b6a164e39fe26b0246a3b02f8e7.tar.gz rt.equinox.framework-0d59d5e22c3e3b6a164e39fe26b0246a3b02f8e7.tar.xz rt.equinox.framework-0d59d5e22c3e3b6a164e39fe26b0246a3b02f8e7.zip |
Bug 363246 - Update org.eclipse.osgi.services and org.eclipse.osgi.util bundles to cmpn R4.3 release.v20111117-1210
Diffstat (limited to 'bundles/org.eclipse.osgi.services')
23 files changed, 10 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF index 935da0c97..6879e1a9a 100644 --- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF @@ -8,8 +8,9 @@ Bundle-Localization: plugin Bundle-Vendor: %eclipse.org Bundle-DocUrl: http://www.eclipse.org Bundle-ContactAddress: www.eclipse.org -Export-Package: org.osgi.service.cm; version="1.3", - org.osgi.service.component; version="1.1", +Export-Package: org.osgi.service.cm; version="1.4", + org.osgi.service.component; version="1.2", + org.osgi.service.component.annotations; version="1.2", org.osgi.service.device; version="1.1", org.osgi.service.event; version="1.3", org.osgi.service.http; version="1.2.1", @@ -17,12 +18,12 @@ Export-Package: org.osgi.service.cm; version="1.3", org.osgi.service.log; version="1.3", org.osgi.service.metatype; version="1.2", org.osgi.service.provisioning; version="1.2", - org.osgi.service.upnp; version="1.1", + org.osgi.service.upnp; version="1.2", org.osgi.service.useradmin; version="1.1", - org.osgi.service.wireadmin; version="1.0" -Import-Package: org.osgi.framework; version=1.2, - org.osgi.service.cm; version="[1.3, 1.4)", - org.osgi.service.component; version="[1.1, 1.2)", + org.osgi.service.wireadmin; version="1.0.1" +Import-Package: org.osgi.framework; version=1.6, + org.osgi.service.cm; version="[1.4, 1.5)", + org.osgi.service.component; 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, 1.3)", @@ -30,9 +31,9 @@ Import-Package: org.osgi.framework; version=1.2, org.osgi.service.log; version="[1.3, 1.4)", org.osgi.service.metatype; version="[1.2, 1.3)", org.osgi.service.provisioning; version="[1.2, 1.3)", - org.osgi.service.upnp; version="[1.1, 1.2)", + 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)", + org.osgi.service.wireadmin; version="[1.0.1, 1.1)", javax.servlet; resolution:="optional", javax.servlet.http; resolution:="optional" DynamicImport-Package: javax.servlet, 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 Binary files differindex d69a867e2..ceeb65785 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 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 Binary files differindex 153d41584..e25f669a2 100644 --- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.class +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.class 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 Binary files differindex 24152897c..bd359a4d8 100644 --- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.class +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection$1.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection$1.class Binary files differdeleted file mode 100644 index 2e472c8e6..000000000 --- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection$1.class +++ /dev/null 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 Binary files differindex b04afa7d3..25058cab5 100644 --- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.class +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.class 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 Binary files differindex 96a15965c..db03a9a07 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 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 Binary files differindex f0d5068f1..1265e1e73 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 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 Binary files differindex 9cdaee3ff..eccb28301 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 diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Activate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Activate.class Binary files differnew file mode 100644 index 000000000..5791c6b75 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Activate.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Component.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Component.class Binary files differnew file mode 100644 index 000000000..04ad0654c --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Component.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ConfigurationPolicy.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ConfigurationPolicy.class Binary files differnew file mode 100644 index 000000000..43e7f5b0f --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ConfigurationPolicy.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Deactivate.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Deactivate.class Binary files differnew file mode 100644 index 000000000..5b11dd292 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Deactivate.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Modified.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Modified.class Binary files differnew file mode 100644 index 000000000..f5fc7fb81 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Modified.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Reference.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Reference.class Binary files differnew file mode 100644 index 000000000..8cc770674 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Reference.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferenceCardinality.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferenceCardinality.class Binary files differnew file mode 100644 index 000000000..64c12e561 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferenceCardinality.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicy.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicy.class Binary files differnew file mode 100644 index 000000000..4c63e7d69 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicy.class diff --git a/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicyOption.class b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicyOption.class Binary files differnew file mode 100644 index 000000000..71061d218 --- /dev/null +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicyOption.class 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 Binary files differindex 3fecae075..42e5976a8 100644 --- a/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.class +++ b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.class 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 Binary files differindex 7d8c624d2..508637d6d 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 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 Binary files differindex e30db7f37..57749c724 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 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 Binary files differindex 73aa307b7..9564c6433 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 diff --git a/bundles/org.eclipse.osgi.services/src.zip b/bundles/org.eclipse.osgi.services/src.zip Binary files differindex f1c650f98..9117081e6 100644 --- a/bundles/org.eclipse.osgi.services/src.zip +++ b/bundles/org.eclipse.osgi.services/src.zip |