Fixed package information. (FELIX-1205)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@797564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/notification/package.html b/org.osgi.compendium/src/main/java/info/dmtree/notification/package.html
deleted file mode 100644
index b95e61c..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/notification/package.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree Notification Package Version 1.0.
-This package contains the public API of the Notification service. This service
-enables the sending of asynchronous notifications to management servers.
-Permission classes are provided by the <code>info.dmtree.security</code> package.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree.notification;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/notification/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/notification/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/notification/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/package.html b/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/package.html
deleted file mode 100644
index 7a17cd9..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree Notification SPI Package Version 1.0.
-This package contains the SPI (Service Provider Interface) of the Notification
-service. These interfaces are implemented by Protocol Adapters capable of 
-delivering notifications to management servers on a specific protocol.  Users of
-the <code>NotificationService</code> interface do not interact directly with this 
-package.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree.notification.spi;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/notification/spi/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/package.html b/org.osgi.compendium/src/main/java/info/dmtree/package.html
deleted file mode 100644
index 51602f5..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree Package Version 1.0.
-This package contains the public API for the Device Management Tree 
-manipulations. Permission classes are provided by the 
-<code>info.dmtree.security</code> package, and DMT plugin interfaces can be found in
-the <code>info.dmtree.spi</code> package.  Asynchronous notifications to remote 
-management servers can be sent using the interfaces in the 
-<code>info.dmtree.notification</code> package.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/packageinfo
deleted file mode 100644
index b3d1f97..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/registry/package.html b/org.osgi.compendium/src/main/java/info/dmtree/registry/package.html
deleted file mode 100644
index b2122ac..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/registry/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree Registry Package Version 1.0.
-This package contains the factory class providing access to the different
-Device Management services for non-OSGi applications.  The 
-<code>DmtServiceFactory</code> class contained in this package provides methods
-for retrieving <code>NotificationService</code> and <code>DmtAdmin</code>
-service implementations.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree.registry;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/registry/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/registry/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/registry/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/security/package.html b/org.osgi.compendium/src/main/java/info/dmtree/security/package.html
deleted file mode 100644
index f5c2fb4..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/security/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree Security Package Version 1.0.
-This package contains the permission classes used by the Device
-Management API in environments that support the Java 2 security model.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree.security;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/security/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/security/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/security/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/spi/package.html b/org.osgi.compendium/src/main/java/info/dmtree/spi/package.html
deleted file mode 100644
index 63291f7..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/spi/package.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Management Tree SPI Package Version 1.0.
-This package contains the interface classes that compose the Device Management 
-SPI (Service Provider Interface).  These interfaces are implemented by DMT plugins;
-users of the <code>DmtAdmin</code> interface do not interact directly with these.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: info.dmtree.spi;version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/info/dmtree/spi/packageinfo b/org.osgi.compendium/src/main/java/info/dmtree/spi/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/info/dmtree/spi/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/org/osgi/application/package.html b/org.osgi.compendium/src/main/java/org/osgi/application/package.html
deleted file mode 100644
index 5230b62..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/application/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Foreign Application Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.application; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/application/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/application/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/application/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/application/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/application/package.html
deleted file mode 100644
index 18daeb5..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/application/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Application Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.application; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/application/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/application/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/application/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html
deleted file mode 100644
index 0234320..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 7356 $ -->
-<BODY>
-<p>Configuration Admin Package Version 1.3.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.cm; version=&quot;[1.3,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/cm/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/cm/packageinfo
deleted file mode 100644
index 0117a56..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/cm/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.3
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html
deleted file mode 100644
index 2e7717e..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Service Component Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.component; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/component/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/component/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/component/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/package.html
deleted file mode 100644
index 5ba69e3..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Deployment Admin Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.deploymentadmin; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/package.html
deleted file mode 100644
index cfa5e3f..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Deployment Admin SPI Package Version 1.0.
-The SPI is used by Resource Processors.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.deploymentadmin.spi; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo
deleted file mode 100644
index b3d1f97..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html
deleted file mode 100644
index 7647c20..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Device Access Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.device; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/device/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/device/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/device/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html
deleted file mode 100644
index 0d9d0bf..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Event Admin Package Version 1.2.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.event; version=&quot;[1.2,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo
deleted file mode 100644
index ef7df68..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html
deleted file mode 100644
index 21f5fed..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Http Service Package Version 1.2.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.http; version=&quot;[1.2,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/http/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/http/packageinfo
deleted file mode 100644
index 6ebb891..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/http/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html
deleted file mode 100644
index cecc3c3..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>IO Connector Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.io; version=&quot;[1.0,2.0)&quot;, javax.microedition.io
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/io/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/io/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/io/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html
deleted file mode 100644
index 02312bb..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Log Service Package Version 1.3.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.log; version=&quot;[1.3,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/log/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/log/packageinfo
deleted file mode 100644
index 0117a56..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/log/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.3
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/metatype/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/metatype/package.html
deleted file mode 100644
index 0b2b533..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/metatype/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Metatype Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.metatype; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/metatype/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/metatype/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/metatype/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/monitor/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/monitor/package.html
deleted file mode 100644
index 5350310..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/monitor/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Monitor Admin Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.monitor; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/monitor/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/monitor/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/monitor/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/prefs/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/prefs/package.html
deleted file mode 100644
index 9bbffe2..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/prefs/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Preferences Service Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.prefs; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/prefs/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/prefs/packageinfo
deleted file mode 100644
index bb27c60..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/prefs/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html
deleted file mode 100644
index 8c28950..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Provisioning Package Version 1.2.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.provisioning; version=&quot;[1.2,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/packageinfo
deleted file mode 100644
index ef7df68..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.2
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/upnp/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/upnp/package.html
deleted file mode 100644
index 5422e04..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/upnp/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>UPnP Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.upnp; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/upnp/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/upnp/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/upnp/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/package.html
deleted file mode 100644
index c8c223d..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>User Admin Package Version 1.1.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.useradmin; version=&quot;[1.1,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/packageinfo
deleted file mode 100644
index 3987f9c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/package.html b/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/package.html
deleted file mode 100644
index 36d1d82..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/package.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Wire Admin Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.service.wireadmin; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
-
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/packageinfo
deleted file mode 100644
index 7c8de03..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/gsm/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/gsm/package.html
deleted file mode 100644
index 2b6bd0e..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/gsm/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Mobile GSM Conditions Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.gsm; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/gsm/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/gsm/packageinfo
deleted file mode 100644
index c266447..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/gsm/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/measurement/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/measurement/package.html
deleted file mode 100644
index 2eb3a8c..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/measurement/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Measurement Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.measurement; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/measurement/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/measurement/packageinfo
deleted file mode 100644
index c266447..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/measurement/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/mobile/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/mobile/package.html
deleted file mode 100644
index 5590197..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/mobile/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Mobile Conditions Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.mobile; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/mobile/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/mobile/packageinfo
deleted file mode 100644
index a4f1546..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/mobile/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/position/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/position/package.html
deleted file mode 100644
index d0d745f..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/position/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Position Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.position; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/position/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/position/packageinfo
deleted file mode 100644
index c266447..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/position/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/tracker/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/tracker/package.html
deleted file mode 100644
index c29c891..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/tracker/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>Tracker Package Version 1.4.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.tracker; version=&quot;[1.4,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/tracker/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/tracker/packageinfo
deleted file mode 100644
index cc13f19..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/tracker/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.4
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/xml/package.html b/org.osgi.compendium/src/main/java/org/osgi/util/xml/package.html
deleted file mode 100644
index e153322..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/xml/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- $Revision: 6204 $ -->
-<BODY>
-<p>XML Parser Package Version 1.0.
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:
-<pre>
-Import-Package: org.osgi.util.xml; version=&quot;[1.0,2.0)&quot;
-</pre>
-</BODY>
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/xml/packageinfo b/org.osgi.compendium/src/main/java/org/osgi/util/xml/packageinfo
deleted file mode 100644
index c266447..0000000
--- a/org.osgi.compendium/src/main/java/org/osgi/util/xml/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/notification/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/notification/package.html
index 5d8f329..b95e61c 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/notification/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/notification/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/notification/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree Notification Package Version 1.0.
 This package contains the public API of the Notification service. This service
@@ -8,6 +8,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree.notification;version=1.0
+Import-Package: info.dmtree.notification;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/notification/spi/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/notification/spi/package.html
index 86d9399..7a17cd9 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/notification/spi/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/notification/spi/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/notification/spi/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree Notification SPI Package Version 1.0.
 This package contains the SPI (Service Provider Interface) of the Notification
@@ -10,6 +10,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree.notification.spi;version=1.0
+Import-Package: info.dmtree.notification.spi;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/package.html
index 017494f..51602f5 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree Package Version 1.0.
 This package contains the public API for the Device Management Tree 
@@ -11,6 +11,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree;version=1.0
+Import-Package: info.dmtree;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/packageinfo b/org.osgi.compendium/src/main/resources/info/dmtree/packageinfo
index 7c8de03..b3d1f97 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/packageinfo
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.0.1
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/registry/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/registry/package.html
index 5ad36d0..b2122ac 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/registry/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/registry/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/registry/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree Registry Package Version 1.0.
 This package contains the factory class providing access to the different
@@ -10,6 +10,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree.registry;version=1.0
+Import-Package: info.dmtree.registry;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/security/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/security/package.html
index 546edb7..f5c2fb4 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/security/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/security/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/security/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree Security Package Version 1.0.
 This package contains the permission classes used by the Device
@@ -7,6 +7,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree.security;version=1.0
+Import-Package: info.dmtree.security;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/info/dmtree/spi/package.html b/org.osgi.compendium/src/main/resources/info/dmtree/spi/package.html
index d795180..63291f7 100644
--- a/org.osgi.compendium/src/main/resources/info/dmtree/spi/package.html
+++ b/org.osgi.compendium/src/main/resources/info/dmtree/spi/package.html
@@ -1,4 +1,4 @@
-<!-- $Header: /cvshome/build/info.dmtree/src/info/dmtree/spi/package.html,v 1.2 2006/07/12 21:07:14 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Management Tree SPI Package Version 1.0.
 This package contains the interface classes that compose the Device Management 
@@ -8,6 +8,6 @@
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: info.dmtree.spi;version=1.0
+Import-Package: info.dmtree.spi;version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/application/package.html b/org.osgi.compendium/src/main/resources/org/osgi/application/package.html
index e3386d0..5230b62 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/application/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/application/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.application/src/org/osgi/application/package.html,v 1.2 2006/07/12 21:07:09 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Foreign Application Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.application; version=1.0
+Import-Package: org.osgi.application; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/application/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/application/package.html
index 57ba7be..18daeb5 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/application/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/application/package.html
@@ -1 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.application/src/org/osgi/service/application/package.html,v 1.5 2006/07/12 21:07:13 hargrave Exp $ -->
<BODY>
<p>Application Package Version 1.0.
<p>Bundles wishing to use this package must list the package
in the Import-Package header of the bundle's manifest.
For example:
<pre>
Import-Package: org.osgi.service.application; version=1.0
</pre>
</BODY>


\ No newline at end of file
+<!-- $Revision: 6204 $ -->
+<BODY>
+<p>Application Package Version 1.1.
+<p>Bundles wishing to use this package must list the package
+in the Import-Package header of the bundle's manifest.
+For example:
+<pre>
+Import-Package: org.osgi.service.application; version=&quot;[1.1,2.0)&quot;
+</pre>
+</BODY>
+
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/application/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/application/packageinfo
index 7c8de03..3987f9c 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/application/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/application/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.1
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/blueprint/container/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/container/package.html
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/service/blueprint/container/package.html
rename to org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/container/package.html
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/blueprint/container/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/container/packageinfo
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/service/blueprint/container/packageinfo
rename to org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/container/packageinfo
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/blueprint/reflect/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/reflect/package.html
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/service/blueprint/reflect/package.html
rename to org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/reflect/package.html
diff --git a/org.osgi.compendium/src/main/java/org/osgi/service/blueprint/reflect/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/reflect/packageinfo
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/service/blueprint/reflect/packageinfo
rename to org.osgi.compendium/src/main/resources/org/osgi/service/blueprint/reflect/packageinfo
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/cm/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/cm/package.html
index e772cb9..0234320 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/cm/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/cm/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/package.html,v 1.3 2006/07/12 21:07:02 hargrave Exp $ -->
+<!-- $Revision: 7356 $ -->
 <BODY>
-<p>Configuration Admin Package Version 1.2.
+<p>Configuration Admin Package Version 1.3.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.cm; version=1.2
+Import-Package: org.osgi.service.cm; version=&quot;[1.3,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/cm/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/cm/packageinfo
index ef7df68..0117a56 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/cm/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/cm/packageinfo
@@ -1 +1 @@
-version 1.2
+version 1.3
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/component/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/component/package.html
index 8189666..2e7717e 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/component/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/component/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/package.html,v 1.3 2006/07/12 21:07:00 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
-<p>Service Component Package Version 1.0.
+<p>Service Component Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.component; version=1.0
+Import-Package: org.osgi.service.component; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/component/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/component/packageinfo
index 7c8de03..3987f9c 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/component/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/component/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.1
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/package.html
index eada510..5ba69e3 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.deploymentadmin/src/org/osgi/service/deploymentadmin/package.html,v 1.4 2006/07/12 21:07:12 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
-<p>Deployment Admin Package Version 1.0.
+<p>Deployment Admin Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.deploymentadmin; version=1.0
+Import-Package: org.osgi.service.deploymentadmin; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/packageinfo
index 7c8de03..3987f9c 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.1
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/package.html
index f5f6c7c..cfa5e3f 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/package.html
@@ -1,12 +1,12 @@
-<!-- $Header: /cvshome/build/org.osgi.service.deploymentadmin/src/org/osgi/service/deploymentadmin/spi/package.html,v 1.3 2006/07/12 21:07:12 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Deployment Admin SPI Package Version 1.0.
 The SPI is used by Resource Processors.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.deploymentadmin.spi; version=1.0
+Import-Package: org.osgi.service.deploymentadmin.spi; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/packageinfo
index 7c8de03..b3d1f97 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/deploymentadmin/spi/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.0.1
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/device/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/device/package.html
index 58c60a7..7647c20 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/device/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/device/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/package.html,v 1.3 2006/07/12 21:07:05 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Device Access Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.device; version=1.1
+Import-Package: org.osgi.service.device; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/event/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/event/package.html
index ac36fcf..0d9d0bf 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/event/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/event/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/package.html,v 1.8 2006/07/12 21:07:18 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
-<p>Event Admin Package Version 1.1.
+<p>Event Admin Package Version 1.2.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.event; version=1.1
+Import-Package: org.osgi.service.event; version=&quot;[1.2,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/event/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/event/packageinfo
index 3987f9c..ef7df68 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/event/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/event/packageinfo
@@ -1 +1 @@
-version 1.1
+version 1.2
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/http/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/http/package.html
index 73e6583..21f5fed 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/http/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/http/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/package.html,v 1.4 2006/07/12 21:07:18 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Http Service Package Version 1.2.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.http; version=1.2
+Import-Package: org.osgi.service.http; version=&quot;[1.2,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/http/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/http/packageinfo
index ef7df68..6ebb891 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/http/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/http/packageinfo
@@ -1 +1 @@
-version 1.2
+version 1.2.1
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/io/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/io/package.html
index 4d4adc4..cecc3c3 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/io/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/io/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/package.html,v 1.3 2006/07/12 21:07:06 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>IO Connector Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.io; version=1.0, javax.microedition.io
+Import-Package: org.osgi.service.io; version=&quot;[1.0,2.0)&quot;, javax.microedition.io
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/log/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/log/package.html
index ebbd7b0..02312bb 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/log/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/log/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/package.html,v 1.4 2006/07/12 21:07:15 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Log Service Package Version 1.3.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.log; version=1.3
+Import-Package: org.osgi.service.log; version=&quot;[1.3,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/metatype/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/metatype/package.html
index 967270c..0b2b533 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/metatype/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/metatype/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/package.html,v 1.5 2006/07/12 21:07:16 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Metatype Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.metatype; version=1.1
+Import-Package: org.osgi.service.metatype; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/monitor/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/monitor/package.html
index 565f431..5350310 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/monitor/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/monitor/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.monitor/src/org/osgi/service/monitor/package.html,v 1.4 2006/07/12 21:07:13 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Monitor Admin Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
-in the <TT>Import-Package</TT> header of the bundle's manifest.
+in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.monitor; version=1.0
+Import-Package: org.osgi.service.monitor; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/package.html
index ce6746a..9bbffe2 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/package.html,v 1.4 2006/07/12 21:06:58 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Preferences Service Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.prefs; version=1.1
+Import-Package: org.osgi.service.prefs; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/packageinfo
index 3987f9c..bb27c60 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/prefs/packageinfo
@@ -1 +1 @@
-version 1.1
+version 1.1.1
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/package.html
index c04a871..8c28950 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.provisioning/src/org/osgi/service/provisioning/package.html,v 1.4 2006/07/12 21:07:07 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
-<p>Provisioning Package Version 1.1.
+<p>Provisioning Package Version 1.2.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.provisioning; version=1.1
+Import-Package: org.osgi.service.provisioning; version=&quot;[1.2,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/packageinfo
index 3987f9c..ef7df68 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/provisioning/packageinfo
@@ -1 +1 @@
-version 1.1
+version 1.2
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/upnp/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/upnp/package.html
index c6e9bcb..5422e04 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/upnp/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/upnp/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/package.html,v 1.4 2006/07/12 21:06:55 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>UPnP Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.upnp; version=1.1
+Import-Package: org.osgi.service.upnp; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/useradmin/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/useradmin/package.html
index 917fbc0..c8c223d 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/useradmin/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/useradmin/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/package.html,v 1.4 2006/07/12 21:07:08 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>User Admin Package Version 1.1.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.useradmin; version=1.1
+Import-Package: org.osgi.service.useradmin; version=&quot;[1.1,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/service/wireadmin/package.html b/org.osgi.compendium/src/main/resources/org/osgi/service/wireadmin/package.html
index 490c0b5..36d1d82 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/service/wireadmin/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/service/wireadmin/package.html
@@ -1,11 +1,11 @@
-<!-- $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/package.html,v 1.3 2006/07/12 21:07:06 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Wire Admin Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.service.wireadmin; version=1.0
+Import-Package: org.osgi.service.wireadmin; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
 
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/cdma/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/cdma/package.html
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/util/cdma/package.html
rename to org.osgi.compendium/src/main/resources/org/osgi/util/cdma/package.html
diff --git a/org.osgi.compendium/src/main/java/org/osgi/util/cdma/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/cdma/packageinfo
similarity index 100%
rename from org.osgi.compendium/src/main/java/org/osgi/util/cdma/packageinfo
rename to org.osgi.compendium/src/main/resources/org/osgi/util/cdma/packageinfo
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/package.html
index 9f0a7c7..2b6bd0e 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.gsm/src/org/osgi/util/gsm/package.html,v 1.2 2006/07/12 21:06:54 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Mobile GSM Conditions Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.gsm; version=1.0
+Import-Package: org.osgi.util.gsm; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/packageinfo
index a4f1546..c266447 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/gsm/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/package.html
index 61a8f9f..2eb3a8c 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.measurement/src/org/osgi/util/measurement/package.html,v 1.5 2006/07/12 21:07:19 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Measurement Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.measurement; version=1.0
+Import-Package: org.osgi.util.measurement; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/packageinfo
index a4f1546..c266447 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/measurement/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/mobile/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/mobile/package.html
index d7e10be..5590197 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/mobile/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/mobile/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.mobile/src/org/osgi/util/mobile/package.html,v 1.2 2006/07/12 21:07:11 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Mobile Conditions Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.mobile; version=1.0
+Import-Package: org.osgi.util.mobile; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/position/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/position/package.html
index 03fb769..d0d745f 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/position/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/position/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.position/src/org/osgi/util/position/package.html,v 1.3 2006/07/12 21:06:57 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>Position Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.position; version=1.0
+Import-Package: org.osgi.util.position; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/position/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/position/packageinfo
index a4f1546..c266447 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/position/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/position/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/package.html
index f75e8c7..c29c891 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.tracker/src/org/osgi/util/tracker/package.html,v 1.4 2006/07/12 21:07:10 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
-<p>Service Tracker Package Version 1.3.
+<p>Tracker Package Version 1.4.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.tracker; version=1.3
+Import-Package: org.osgi.util.tracker; version=&quot;[1.4,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/packageinfo
index 0a6e6dc..cc13f19 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/tracker/packageinfo
@@ -1 +1 @@
-version 1.3.3
+version 1.4
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/xml/package.html b/org.osgi.compendium/src/main/resources/org/osgi/util/xml/package.html
index 45e61bb..e153322 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/xml/package.html
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/xml/package.html
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.util.xml/src/org/osgi/util/xml/package.html,v 1.2 2006/07/12 21:06:59 hargrave Exp $ -->
+<!-- $Revision: 6204 $ -->
 <BODY>
 <p>XML Parser Package Version 1.0.
 <p>Bundles wishing to use this package must list the package
 in the Import-Package header of the bundle's manifest.
 For example:
 <pre>
-Import-Package: org.osgi.util.xml; version=1.0
+Import-Package: org.osgi.util.xml; version=&quot;[1.0,2.0)&quot;
 </pre>
 </BODY>
diff --git a/org.osgi.compendium/src/main/resources/org/osgi/util/xml/packageinfo b/org.osgi.compendium/src/main/resources/org/osgi/util/xml/packageinfo
index a4f1546..c266447 100644
--- a/org.osgi.compendium/src/main/resources/org/osgi/util/xml/packageinfo
+++ b/org.osgi.compendium/src/main/resources/org/osgi/util/xml/packageinfo
@@ -1 +1 @@
-version 1.0
\ No newline at end of file
+version 1.0.1
\ No newline at end of file