Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-11-17 07:10:29 -0500
committerThomas Watson2011-11-17 07:10:29 -0500
commit0d59d5e22c3e3b6a164e39fe26b0246a3b02f8e7 (patch)
tree5346655cb7e3c5a361406ef9780e4bf35f593d1d
parent38602d6ab8abeb5e2054765df8680921324d048e (diff)
downloadrt.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
-rw-r--r--bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF19
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.classbin532 -> 674 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationEvent.classbin1241 -> 1651 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermission.classbin1620 -> 5843 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection$1.classbin1195 -> 0 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection.classbin1647 -> 5594 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.classbin366 -> 492 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.classbin246 -> 315 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.classbin361 -> 448 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Activate.classbin0 -> 406 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Component.classbin0 -> 1028 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ConfigurationPolicy.classbin0 -> 1495 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Deactivate.classbin0 -> 410 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Modified.classbin0 -> 406 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Reference.classbin0 -> 1182 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferenceCardinality.classbin0 -> 1568 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicy.classbin0 -> 1396 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicyOption.classbin0 -> 1442 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPException.classbin812 -> 1172 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.classbin882 -> 882 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.classbin1460 -> 1460 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.classbin1522 -> 1522 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/src.zipbin143274 -> 161040 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.classbin6182 -> 6182 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/src.zipbin20746 -> 20755 bytes
25 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
index 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
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
index 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
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
index 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
Binary files differ
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
deleted file mode 100644
index 2e472c8e6..000000000
--- a/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPermissionCollection$1.class
+++ /dev/null
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
index 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
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 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
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 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
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 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
Binary files differ
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
new file mode 100644
index 000000000..5791c6b75
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Activate.class
Binary files differ
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
new file mode 100644
index 000000000..04ad0654c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Component.class
Binary files differ
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
new file mode 100644
index 000000000..43e7f5b0f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ConfigurationPolicy.class
Binary files differ
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
new file mode 100644
index 000000000..5b11dd292
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Deactivate.class
Binary files differ
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
new file mode 100644
index 000000000..f5fc7fb81
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Modified.class
Binary files differ
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
new file mode 100644
index 000000000..8cc770674
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/Reference.class
Binary files differ
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
new file mode 100644
index 000000000..64c12e561
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferenceCardinality.class
Binary files differ
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
new file mode 100644
index 000000000..4c63e7d69
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicy.class
Binary files differ
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
new file mode 100644
index 000000000..71061d218
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/component/annotations/ReferencePolicyOption.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
index 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
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 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
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 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
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 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
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/src.zip b/bundles/org.eclipse.osgi.services/src.zip
index f1c650f98..9117081e6 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/org/osgi/util/measurement/Unit.class b/bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.class
index f170ffec3..7968831e7 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/src.zip b/bundles/org.eclipse.osgi.util/src.zip
index e2c673054..9d64d7b27 100644
--- a/bundles/org.eclipse.osgi.util/src.zip
+++ b/bundles/org.eclipse.osgi.util/src.zip
Binary files differ

Back to the top