Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2005-04-11 18:34:38 +0000
committerDJ Houghton2005-04-11 18:34:38 +0000
commitf9019fd17661ba7a1db409bf16d6025edb6d727b (patch)
tree3efa6d44d411079f3aedf2594f29a25bd5cec34e
parent219a8df546eff8b85e0165cd7a15e91726b3435b (diff)
downloadrt.equinox.framework-f9019fd17661ba7a1db409bf16d6025edb6d727b.tar.gz
rt.equinox.framework-f9019fd17661ba7a1db409bf16d6025edb6d727b.tar.xz
rt.equinox.framework-f9019fd17661ba7a1db409bf16d6025edb6d727b.zip
Changes to ship as a JAR.
-rw-r--r--bundles/org.eclipse.osgi.services/.classpath10
-rw-r--r--bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF13
-rw-r--r--bundles/org.eclipse.osgi.services/build.properties7
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/Configuration.classbin0 -> 532 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationAdmin.classbin0 -> 743 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.classbin0 -> 698 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.classbin0 -> 314 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedService.classbin0 -> 246 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/cm/ManagedServiceFactory.classbin0 -> 361 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.classbin0 -> 303 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Device.classbin0 -> 201 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Driver.classbin0 -> 311 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverLocator.classbin0 -> 312 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/DriverSelector.classbin0 -> 280 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/device/Match.classbin0 -> 207 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.classbin0 -> 689 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpService.classbin0 -> 597 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/http/NamespaceException.classbin0 -> 507 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectionFactory.classbin0 -> 349 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/io/ConnectorService.classbin0 -> 857 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.classbin0 -> 659 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogEntry.classbin0 -> 384 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogListener.classbin0 -> 209 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogReaderService.classbin0 -> 272 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/log/LogService.classbin0 -> 529 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/AttributeDefinition.classbin0 -> 795 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.classbin0 -> 309 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.classbin0 -> 523 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.classbin0 -> 1146 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPAction.classbin0 -> 490 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPDevice.classbin0 -> 1605 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPEventListener.classbin0 -> 311 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.classbin0 -> 345 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.classbin0 -> 632 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPStateVariable.classbin0 -> 1456 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Authorization.classbin0 -> 260 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Group.classbin0 -> 356 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/Role.classbin0 -> 337 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/User.classbin0 -> 273 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdmin.classbin0 -> 668 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminEvent.classbin0 -> 872 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminListener.classbin0 -> 213 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermission.classbin0 -> 4607 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/useradmin/UserAdminPermissionCollection.classbin0 -> 2141 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/BasicEnvelope.classbin0 -> 707 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Consumer.classbin0 -> 268 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Envelope.classbin0 -> 236 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Producer.classbin0 -> 266 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/Wire.classbin0 -> 445 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdmin.classbin0 -> 531 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminEvent.classbin0 -> 1244 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireAdminListener.classbin0 -> 216 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WireConstants.classbin0 -> 1522 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermission.classbin0 -> 3565 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.classbin0 -> 2121 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/services.jarbin33469 -> 0 bytes
-rw-r--r--bundles/org.eclipse.osgi.services/src.zip (renamed from bundles/org.eclipse.osgi.services/servicessrc.zip)bin124733 -> 124733 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/.classpath10
-rw-r--r--bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.osgi.util/build.properties5
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Measurement.classbin0 -> 3557 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/State.classbin0 -> 1251 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/measurement/Unit.classbin0 -> 6130 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.classbin0 -> 2660 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.classbin0 -> 6302 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/src.zip (renamed from bundles/org.eclipse.osgi.util/utilsrc.zip)bin20037 -> 20037 bytes
-rw-r--r--bundles/org.eclipse.osgi.util/util.jarbin10978 -> 0 bytes
67 files changed, 23 insertions, 27 deletions
diff --git a/bundles/org.eclipse.osgi.services/.classpath b/bundles/org.eclipse.osgi.services/.classpath
index 8ab889d5c..ab44e22e8 100644
--- a/bundles/org.eclipse.osgi.services/.classpath
+++ b/bundles/org.eclipse.osgi.services/.classpath
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" sourcepath="servicessrc.zip" kind="lib" path="services.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" sourcepath="src.zip" kind="lib" path="org">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
index 66abc11c4..deaf093ac 100644
--- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %eclipse.org
Bundle-DocUrl: http://www.eclipse.org
Bundle-ContactAddress: www.eclipse.org
Bundle-Copyright: %copyright
-Bundle-ClassPath: services.jar
+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,
@@ -21,14 +21,3 @@ Export-Package: org.osgi.service.cm; specification-version=1.1,
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
-Provide-Package: org.osgi.service.cm,
- org.osgi.service.device,
- org.osgi.service.http,
- org.osgi.service.io,
- org.osgi.service.jini,
- org.osgi.service.log,
- org.osgi.service.metatype,
- org.osgi.service.provisioning,
- org.osgi.service.upnp,
- org.osgi.service.useradmin,
- org.osgi.service.wireadmin
diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties
index fb871feef..5febb34b2 100644
--- a/bundles/org.eclipse.osgi.services/build.properties
+++ b/bundles/org.eclipse.osgi.services/build.properties
@@ -9,9 +9,8 @@
# IBM Corporation - initial API and implementation
###############################################################################
bin.includes = \
- plugin.xml,\
plugin.properties,\
- services.jar,\
about.html,\
- META-INF/
-src.includes = *.zip,about.html
+ META-INF/,\
+ org/
+src.includes = src.zip,about.html
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
new file mode 100644
index 000000000..58648024c
--- /dev/null
+++ 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
new file mode 100644
index 000000000..0e2fb8945
--- /dev/null
+++ 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/ConfigurationException.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationException.class
new file mode 100644
index 000000000..705feeb0a
--- /dev/null
+++ 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/ConfigurationPlugin.class b/bundles/org.eclipse.osgi.services/org/osgi/service/cm/ConfigurationPlugin.class
new file mode 100644
index 000000000..01b2c515e
--- /dev/null
+++ 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
new file mode 100644
index 000000000..5cfd6c459
--- /dev/null
+++ 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
new file mode 100644
index 000000000..f068a1841
--- /dev/null
+++ 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/device/Constants.class b/bundles/org.eclipse.osgi.services/org/osgi/service/device/Constants.class
new file mode 100644
index 000000000..9bf7a059e
--- /dev/null
+++ 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
new file mode 100644
index 000000000..029c4c010
--- /dev/null
+++ 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
new file mode 100644
index 000000000..764fde5c7
--- /dev/null
+++ 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
new file mode 100644
index 000000000..31a8743dd
--- /dev/null
+++ 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
new file mode 100644
index 000000000..c2a65c4a7
--- /dev/null
+++ 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
new file mode 100644
index 000000000..4bb481760
--- /dev/null
+++ 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/http/HttpContext.class b/bundles/org.eclipse.osgi.services/org/osgi/service/http/HttpContext.class
new file mode 100644
index 000000000..1ec1cbc7c
--- /dev/null
+++ 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
new file mode 100644
index 000000000..47b348ba5
--- /dev/null
+++ 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
new file mode 100644
index 000000000..d2eb84ebd
--- /dev/null
+++ 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
new file mode 100644
index 000000000..aa331926c
--- /dev/null
+++ 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
new file mode 100644
index 000000000..c5863bbaa
--- /dev/null
+++ 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
new file mode 100644
index 000000000..c48489d55
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/jini/JiniDriver.class
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
new file mode 100644
index 000000000..ee992fef2
--- /dev/null
+++ 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
new file mode 100644
index 000000000..193295300
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e1a96f283
--- /dev/null
+++ 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
new file mode 100644
index 000000000..6ffee72ac
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e2f780e1c
--- /dev/null
+++ 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/MetaTypeProvider.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/MetaTypeProvider.class
new file mode 100644
index 000000000..a20c2ba84
--- /dev/null
+++ 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/ObjectClassDefinition.class b/bundles/org.eclipse.osgi.services/org/osgi/service/metatype/ObjectClassDefinition.class
new file mode 100644
index 000000000..84da92f36
--- /dev/null
+++ 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/provisioning/ProvisioningService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/provisioning/ProvisioningService.class
new file mode 100644
index 000000000..40c497f6f
--- /dev/null
+++ 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
new file mode 100644
index 000000000..d2d5c52d8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e722c9b9b
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e35d8dbca
--- /dev/null
+++ 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/UPnPIcon.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPIcon.class
new file mode 100644
index 000000000..12584cff4
--- /dev/null
+++ 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/UPnPService.class b/bundles/org.eclipse.osgi.services/org/osgi/service/upnp/UPnPService.class
new file mode 100644
index 000000000..1f615fcc4
--- /dev/null
+++ 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
new file mode 100644
index 000000000..99dff97b7
--- /dev/null
+++ 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
new file mode 100644
index 000000000..7a3a62c1d
--- /dev/null
+++ 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
new file mode 100644
index 000000000..1f4397aef
--- /dev/null
+++ 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
new file mode 100644
index 000000000..394192f26
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e5803635a
--- /dev/null
+++ 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
new file mode 100644
index 000000000..466846d05
--- /dev/null
+++ 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
new file mode 100644
index 000000000..94b0034a3
--- /dev/null
+++ 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
new file mode 100644
index 000000000..f99288f18
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e528b3bd7
--- /dev/null
+++ 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
new file mode 100644
index 000000000..cb5db25ff
--- /dev/null
+++ 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
new file mode 100644
index 000000000..52aa700c4
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e1fbe8970
--- /dev/null
+++ 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
new file mode 100644
index 000000000..db35904a6
--- /dev/null
+++ 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
new file mode 100644
index 000000000..0cb245835
--- /dev/null
+++ 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
new file mode 100644
index 000000000..174944fab
--- /dev/null
+++ 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
new file mode 100644
index 000000000..8fdb64a28
--- /dev/null
+++ 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
new file mode 100644
index 000000000..172198912
--- /dev/null
+++ 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
new file mode 100644
index 000000000..7399b19c7
--- /dev/null
+++ 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
new file mode 100644
index 000000000..0c95dd6ad
--- /dev/null
+++ 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
new file mode 100644
index 000000000..359ec760b
--- /dev/null
+++ 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
new file mode 100644
index 000000000..4895d2910
--- /dev/null
+++ b/bundles/org.eclipse.osgi.services/org/osgi/service/wireadmin/WirePermissionCollection.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/services.jar b/bundles/org.eclipse.osgi.services/services.jar
deleted file mode 100644
index f760f6ad0..000000000
--- a/bundles/org.eclipse.osgi.services/services.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.osgi.services/servicessrc.zip b/bundles/org.eclipse.osgi.services/src.zip
index 5edd563e3..5edd563e3 100644
--- a/bundles/org.eclipse.osgi.services/servicessrc.zip
+++ b/bundles/org.eclipse.osgi.services/src.zip
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/.classpath b/bundles/org.eclipse.osgi.util/.classpath
index 21cf47cbb..ab44e22e8 100644
--- a/bundles/org.eclipse.osgi.util/.classpath
+++ b/bundles/org.eclipse.osgi.util/.classpath
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" sourcepath="utilsrc.zip" kind="lib" path="util.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" sourcepath="src.zip" kind="lib" path="org">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
index a868e1969..0e84708cc 100644
--- a/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.util/META-INF/MANIFEST.MF
@@ -8,11 +8,8 @@ Bundle-Localization: plugin
Bundle-DocUrl: http://www.eclipse.org
Bundle-ContactAddress: www.eclipse.org
Bundle-Copyright: %copyright
-Bundle-ClassPath: util.jar
+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
-Provide-Package: org.osgi.util.measurement,
- org.osgi.util.position,
- org.osgi.util.xml
Import-Package: org.osgi.framework; specification-version=1.1
diff --git a/bundles/org.eclipse.osgi.util/build.properties b/bundles/org.eclipse.osgi.util/build.properties
index 33963392c..6eddc8f7e 100644
--- a/bundles/org.eclipse.osgi.util/build.properties
+++ b/bundles/org.eclipse.osgi.util/build.properties
@@ -9,9 +9,8 @@
# IBM Corporation - initial API and implementation
###############################################################################
bin.includes = \
- plugin.xml,\
plugin.properties,\
- *.jar,\
+ org/,\
about.html,\
META-INF/
-src.includes = *.zip,about.html
+src.includes = src.zip,about.html
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
new file mode 100644
index 000000000..9e0626564
--- /dev/null
+++ 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
new file mode 100644
index 000000000..822b26aea
--- /dev/null
+++ 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
new file mode 100644
index 000000000..a464197c1
--- /dev/null
+++ 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/position/Position.class b/bundles/org.eclipse.osgi.util/org/osgi/util/position/Position.class
new file mode 100644
index 000000000..1909757c8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..5a18b4fde
--- /dev/null
+++ b/bundles/org.eclipse.osgi.util/org/osgi/util/xml/XMLParserActivator.class
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/utilsrc.zip b/bundles/org.eclipse.osgi.util/src.zip
index 109863747..109863747 100644
--- a/bundles/org.eclipse.osgi.util/utilsrc.zip
+++ b/bundles/org.eclipse.osgi.util/src.zip
Binary files differ
diff --git a/bundles/org.eclipse.osgi.util/util.jar b/bundles/org.eclipse.osgi.util/util.jar
deleted file mode 100644
index 0a539a077..000000000
--- a/bundles/org.eclipse.osgi.util/util.jar
+++ /dev/null
Binary files differ

Back to the top