felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r465395 [1/3] - in /incubator/felix/trunk/org.osgi.compendium: ./ src/main/java/org/osgi/service/cm/ src/main/java/org/osgi/service/component/ src/main/java/org/osgi/service/device/ src/main/java/org/osgi/service/event/ src/main/java/org/os...
Date Wed, 18 Oct 2006 22:02:42 GMT
Author: rickhall
Date: Wed Oct 18 15:02:38 2006
New Revision: 465395

URL: http://svn.apache.org/viewvc?view=rev&rev=465395
Log:
Updated our source to the official/final OSGi 4.0.1 source.

Modified:
    incubator/felix/trunk/org.osgi.compendium/pom.xml
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/Configuration.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationException.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationListener.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentConstants.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentContext.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentException.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentFactory.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentInstance.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Constants.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Device.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Driver.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverLocator.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverSelector.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Match.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/Event.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventAdmin.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventConstants.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventHandler.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/TopicPermission.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpContext.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/NamespaceException.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogEntry.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogListener.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogReaderService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/AttributeDefinition.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/BackingStoreException.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/Preferences.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/PreferencesService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/ProvisioningService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPAction.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPDevice.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPEventListener.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPException.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPIcon.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPLocalStateVariable.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPService.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPStateVariable.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Authorization.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Group.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Role.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/User.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdmin.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminEvent.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminListener.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminPermission.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/BasicEnvelope.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Consumer.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Envelope.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Producer.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Wire.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdmin.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdminEvent.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdminListener.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireConstants.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WirePermission.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/measurement/Measurement.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/measurement/State.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/measurement/Unit.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/measurement/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/position/Position.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/position/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/tracker/ServiceTracker.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/tracker/package.html
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/tracker/packageinfo
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/xml/XMLParserActivator.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/util/xml/package.html

Modified: incubator/felix/trunk/org.osgi.compendium/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/pom.xml?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/pom.xml (original)
+++ incubator/felix/trunk/org.osgi.compendium/pom.xml Wed Oct 18 15:02:38 2006
@@ -21,14 +21,12 @@
       <version>${pom.version}</version>
       <scope>provided</scope>
     </dependency>
-<!--
     <dependency>
-      <groupId>javax.microedition</groupId>
-      <artifactId>javax.microedition</artifactId>
-      <version>1.0.4</version>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.foundation</artifactId>
+      <version>${pom.version}</version>
       <scope>provided</scope>
     </dependency>
--->
   </dependencies>
   <build>
     <plugins>
@@ -47,7 +45,7 @@
             <bundleCopyright>Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.</bundleCopyright>
             <bundleCategory>osgi</bundleCategory>
             <bundleDocUrl>http://www.osgi.org/</bundleDocUrl>
-            <exportPackage>org.osgi.service.cm ;specification-version="1.2",org.osgi.service.component ;specification-version="1.0",org.osgi.service.device ;specification-version="1.1",org.osgi.service.event ;specification-version="1.0.1",org.osgi.service.http ;specification-version="1.2",org.osgi.service.io ;specification-version="1.0",org.osgi.service.log ;specification-version="1.3",org.osgi.service.metatype ;specification-version="1.1",org.osgi.service.prefs ;specification-version="1.1",org.osgi.service.provisioning ;specification-version="1.1",org.osgi.service.upnp ;specification-version="1.1",org.osgi.service.useradmin ;specification-version="1.1",org.osgi.service.wireadmin ;specification-version="1.0",org.osgi.util.measurement ;specification-version="1.0",org.osgi.util.position ;specification-version="1.0",org.osgi.util.tracker ;specification-version="1.3.1",org.osgi.util.xml ;specification-version="1.0"</exportPackage>
+            <exportPackage>org.osgi.service.cm ;specification-version="1.2",org.osgi.service.component ;specification-version="1.0",org.osgi.service.device ;specification-version="1.1",org.osgi.service.event ;specification-version="1.1",org.osgi.service.http ;specification-version="1.2",org.osgi.service.io ;specification-version="1.0",org.osgi.service.log ;specification-version="1.3",org.osgi.service.metatype ;specification-version="1.1",org.osgi.service.prefs ;specification-version="1.1",org.osgi.service.provisioning ;specification-version="1.1",org.osgi.service.upnp ;specification-version="1.1",org.osgi.service.useradmin ;specification-version="1.1",org.osgi.service.wireadmin ;specification-version="1.0",org.osgi.util.measurement ;specification-version="1.0",org.osgi.util.position ;specification-version="1.0",org.osgi.util.tracker ;specification-version="1.3.2",org.osgi.util.xml ;specification-version="1.0"</exportPackage>
             <dynamicImportPackage>*</dynamicImportPackage>
           </osgiManifest>
         </configuration>

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/Configuration.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/Configuration.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/Configuration.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/Configuration.java,v 1.16 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/Configuration.java,v 1.17 2006/06/16 16:31:28 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@
  * Managed Service Factory and a Managed Service. When it is important to
  * differentiate between these two the term "factory configuration" is used.
  * 
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
  */
 public interface Configuration {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationAdmin.java,v 1.14 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationAdmin.java,v 1.16 2006/07/11 00:54:03 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@
  * When the ConfigurationAdmin detects the registration of a Managed Service, it
  * checks its persistent storage for a configuration object whose PID matches
  * the PID registration property (<code>service.pid</code>) of the Managed
- * Service. If found, it calls {@link ManagedService#updated}method with the
+ * Service. If found, it calls {@link ManagedService#updated} method with the
  * new properties. The implementation of a Configuration Admin service must run
  * these call-backs asynchronously to allow proper synchronization.
  * 
@@ -98,9 +98,9 @@
  * bundle". This is a loose way of referring to the bundle which obtained the
  * Configuration Admin service from the service registry. Implementations of
  * <code>ConfigurationAdmin</code> must use a
- * {@link org.osgi.framework.ServiceFactory}to support this concept.
+ * {@link org.osgi.framework.ServiceFactory} to support this concept.
  * 
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.16 $
  */
 public interface ConfigurationAdmin {
 	/**
@@ -125,7 +125,7 @@
 	 * 
 	 * The properties of the new <code>Configuration</code> object are
 	 * <code>null</code> until the first time that its
-	 * {@link Configuration#update(Dictionary)}method is called.
+	 * {@link Configuration#update(Dictionary)} method is called.
 	 * 
 	 * <p>
 	 * It is not required that the <code>factoryPid</code> maps to a
@@ -147,7 +147,7 @@
 	 * 
 	 * The properties of the new <code>Configuration</code> object are
 	 * <code>null</code> until the first time that its
-	 * {@link Configuration#update(Dictionary)}method is called.
+	 * {@link Configuration#update(Dictionary)} method is called.
 	 * 
 	 * <p>
 	 * It is not required that the <code>factoryPid</code> maps to a

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationEvent.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationEvent.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationEvent.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationEvent.java,v 1.8 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationEvent.java,v 1.9 2006/06/16 16:31:28 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
  * 
  * @see ConfigurationListener
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * @since 1.2
  */
 public class ConfigurationEvent {
@@ -164,4 +164,4 @@
 	public ServiceReference getReference() {
 		return reference;
 	}
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationException.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationException.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationException.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationException.java,v 1.11 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationException.java,v 1.13 2006/07/11 13:15:52 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,18 @@
  * An <code>Exception</code> class to inform the Configuration Admin service
  * of problems with configuration data.
  * 
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.13 $
  */
 public class ConfigurationException extends Exception {
 	static final long	serialVersionUID	= -1690090413441769377L;
 
-	private String		property;
-	private String		reason;
+	private final String		property;
+	private final String		reason;
 
 	/**
 	 * Nested exception.
 	 */
-	private Throwable	cause;
+	private final Throwable	cause;
 
 	/**
 	 * Create a <code>ConfigurationException</code> object.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationListener.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationListener.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationListener.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationListener.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationListener.java,v 1.9 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationListener.java,v 1.10 2006/06/16 16:31:28 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
  * require <code>ServicePermission[ConfigurationListener,REGISTER]</code> to
  * register a <code>ConfigurationListener</code> service.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  * @since 1.2
  */
 public interface ConfigurationListener {
@@ -47,4 +47,4 @@
 	 * @param event The <code>ConfigurationEvent</code>.
 	 */
 	public void configurationEvent(ConfigurationEvent event);
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPermission.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPermission.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPermission.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationPermission.java,v 1.20 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationPermission.java,v 1.22 2006/07/08 00:42:00 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * 
  * This permission has only a single action: CONFIGURE.
  * 
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.22 $
  * @since 1.2
  */
 
@@ -193,8 +193,9 @@
 	 */
 
 	public Enumeration elements() {
+		final boolean nonEmpty = hasElement;
 		return new Enumeration() {
-			private boolean	more	= hasElement;
+			private boolean	more = nonEmpty;
 
 			public boolean hasMoreElements() {
 				return more;

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationPlugin.java,v 1.10 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ConfigurationPlugin.java,v 1.11 2006/06/16 16:31:28 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@
  * Omitting the <code>cm.target</code> registration property means that the
  * plugin is called for all configuration updates.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 public interface ConfigurationPlugin {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedService.java,v 1.11 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedService.java,v 1.12 2006/06/16 16:31:28 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@
  * registration properties. This will allow the Configuration Admin service to
  * set properties on services which can then be used by other applications.
  * 
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  */
 public interface ManagedService {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedServiceFactory.java,v 1.10 2006/03/14 01:21:09 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/ManagedServiceFactory.java,v 1.12 2006/07/11 00:54:03 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@
  *   
  * </pre>
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.12 $
  */
 public interface ManagedServiceFactory {
 	/**
@@ -126,7 +126,7 @@
 	 * <p>
 	 * When the implementation of updated detects any kind of error in the
 	 * configuration properties, it should create a new
-	 * {@link ConfigurationException}which describes the problem.
+	 * {@link ConfigurationException} which describes the problem.
 	 * 
 	 * <p>
 	 * The Configuration Admin service must call this method asynchronously.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/cm/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.cm/src/org/osgi/service/cm/package.html,v 1.2 2004/12/01 19:01:11 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Configuration Admin service Package. Specification Version 1.2
+<p>Configuration 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:

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentConstants.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentConstants.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentConstants.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentConstants.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentConstants.java,v 1.13 2006/03/14 01:20:50 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentConstants.java,v 1.14 2006/06/16 16:31:26 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 /**
  * Defines standard names for Service Component constants.
  * 
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
  */
 public interface ComponentConstants {
 	/**
@@ -68,4 +68,4 @@
 	 * property must be <code>String</code>.
 	 */
 	public final static String	REFERENCE_TARGET_SUFFIX	= ".target";
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentContext.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentContext.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentContext.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentContext.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentContext.java,v 1.19 2006/03/14 01:20:50 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentContext.java,v 1.20 2006/06/16 16:31:26 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
  * the method. If the method is found, if it is declared protected or public,
  * the method will be called. Otherwise, the method will not be called.
  * 
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
  */
 public interface ComponentContext {
 	/**
@@ -195,4 +195,4 @@
 	 */
 	public ServiceReference getServiceReference();
 
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentException.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentException.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentException.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentException.java,v 1.11 2006/03/14 01:20:50 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentException.java,v 1.13 2006/07/11 13:15:56 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@
 /**
  * Unchecked exception which may be thrown by the Service Component Runtime.
  * 
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.13 $
  */
 public class ComponentException extends RuntimeException {
 	static final long	serialVersionUID	= -7438212656298726924L;
 	/**
 	 * Nested exception.
 	 */
-	private Throwable	cause;
+	private final Throwable	cause;
 
 	/**
 	 * Construct a new ComponentException with the specified message and cause.
@@ -84,4 +84,4 @@
 	public Throwable initCause(Throwable cause) {
 		throw new IllegalStateException();
 	}
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentFactory.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentFactory.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentFactory.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentFactory.java,v 1.17 2006/03/14 01:20:50 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentFactory.java,v 1.19 2006/06/16 16:31:26 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,14 +27,15 @@
  * created and activated rather than automatically creating and activating
  * component configuration as necessary.
  * 
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.19 $
  */
 public interface ComponentFactory {
 	/**
 	 * Create and activate a new component configuration. Additional properties
 	 * may be provided for the component configuration.
 	 * 
-	 * @param properties Additional properties for the component configuration.
+	 * @param properties Additional properties for the component configuration
+	 *        or <code>null</code> if there are no additional properties.
 	 * @return A <code>ComponentInstance</code> object encapsulating the
 	 *         component instance of the component configuration. The component
 	 *         configuration has been activated and, if the component specifies
@@ -44,4 +45,4 @@
 	 *         activate the component configuration.
 	 */
 	public ComponentInstance newInstance(Dictionary properties);
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentInstance.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentInstance.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentInstance.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/ComponentInstance.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentInstance.java,v 1.12 2006/03/14 01:20:50 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/ComponentInstance.java,v 1.13 2006/06/16 16:31:26 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2004, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2004, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * ComponentInstances are never reused. A new ComponentInstance object will be
  * created when the component configuration is activated again.
  * 
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
  */
 public interface ComponentInstance {
 	/**
@@ -44,4 +44,4 @@
 	 *         configuration has been deactivated.
 	 */
 	public Object getInstance();
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/component/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.component/src/org/osgi/service/component/package.html,v 1.2 2004/12/01 19:01:25 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Service Component Package. Specification Version 1.0.
+<p>Service Component 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:

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Constants.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Constants.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Constants.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Constants.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Constants.java,v 1.7 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Constants.java,v 1.9 2006/07/11 00:54:08 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
 
 /**
  * This interface defines standard names for property keys associated with
- * {@link Device}and {@link Driver}services.
+ * {@link Device} and {@link Driver} services.
  * 
  * <p>
  * The values associated with these keys are of type <code>java.lang.String</code>,
  * unless otherwise stated.
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.9 $
  * @since 1.1
  * @see Device
  * @see Driver
@@ -41,7 +41,7 @@
 	 * 
 	 * <ul>
 	 * <li>It must be independent of the location from where it is obtained.
-	 * <li>It must be independent of the {@link DriverLocator}service that
+	 * <li>It must be independent of the {@link DriverLocator} service that
 	 * downloaded it.
 	 * <li>It must be unique.
 	 * <li>It must be different for different revisions of the same driver.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Device.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Device.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Device.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Device.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Device.java,v 1.8 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Device.java,v 1.10 2006/07/11 00:54:08 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  * 
  * <p>
  * A service must implement this interface or use the
- * {@link Constants#DEVICE_CATEGORY}registration property to indicate that it
+ * {@link Constants#DEVICE_CATEGORY} registration property to indicate that it
  * is a device. Any services implementing this interface or registered with the
  * <code>DEVICE_CATEGORY</code> property will be discovered by the device manager.
  * 
@@ -31,18 +31,18 @@
  * Device services implementing this interface give the device manager the
  * opportunity to indicate to the device that no drivers were found that could
  * (further) refine it. In this case, the device manager calls the
- * {@link #noDriverFound}method on the <code>Device</code> object.
+ * {@link #noDriverFound} method on the <code>Device</code> object.
  * 
  * <p>
  * Specialized device implementations will extend this interface by adding
  * methods appropriate to their device category to it.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  * @see Driver
  */
 public interface Device {
 	/**
-	 * Return value from {@link Driver#match}indicating that the driver cannot
+	 * Return value from {@link Driver#match} indicating that the driver cannot
 	 * refine the device presented to it by the device manager.
 	 * 
 	 * The value is zero.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Driver.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Driver.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Driver.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Driver.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Driver.java,v 1.9 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Driver.java,v 1.11 2006/07/11 00:54:08 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@
 /**
  * A <code>Driver</code> service object must be registered by each Driver bundle
  * wishing to attach to Device services provided by other drivers. For each
- * newly discovered {@link Device}object, the device manager enters a bidding
- * phase. The <code>Driver</code> object whose {@link #match}method bids the
+ * newly discovered {@link Device} object, the device manager enters a bidding
+ * phase. The <code>Driver</code> object whose {@link #match} method bids the
  * highest for a particular <code>Device</code> object will be instructed by the
  * device manager to attach to the <code>Device</code> object.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.11 $
  * @see Device
  * @see DriverLocator
  */
@@ -37,7 +37,7 @@
 	 * 
 	 * The Device service is represented by the given {@link ServiceReference}
 	 * and returns a value indicating how well this driver can support the given
-	 * Device service, or {@link Device#MATCH_NONE}if it cannot support the
+	 * Device service, or {@link Device#MATCH_NONE} if it cannot support the
 	 * given Device service at all.
 	 * 
 	 * <p>

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverLocator.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverLocator.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverLocator.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverLocator.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/DriverLocator.java,v 1.8 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/DriverLocator.java,v 1.10 2006/07/12 21:22:12 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
  */
 package org.osgi.service.device;
 
-import java.util.Dictionary;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.Dictionary;
 
 /**
  * A Driver Locator service can find and load device driver bundles given a
@@ -30,7 +30,7 @@
  * providers and encapsulate all provider-specific details related to the
  * location and acquisition of driver bundles.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  * @see Driver
  */
 public interface DriverLocator {

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverSelector.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverSelector.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverSelector.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/DriverSelector.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/DriverSelector.java,v 1.8 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/DriverSelector.java,v 1.9 2006/06/16 16:31:29 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  * service, or if it returns an invalid result, or throws an <code>Exception</code>,
  * the device manager uses the default selection strategy.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * @since 1.1
  */
 public interface DriverSelector {

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Match.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Match.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Match.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/Match.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Match.java,v 1.8 2006/03/14 01:20:43 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/Match.java,v 1.9 2006/06/16 16:31:29 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2001, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  * Instances of <code>Match</code> are used in the {@link DriverSelector#select}
  * method to identify Driver services matching a Device service.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * @since 1.1
  * @see DriverSelector
  */

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/device/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.device/src/org/osgi/service/device/package.html,v 1.2 2004/12/01 19:01:15 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Device Access Package. Specification Version 1.1.
+<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:

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/Event.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/Event.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/Event.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/Event.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/Event.java,v 1.6 2006/03/14 01:21:30 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/Event.java,v 1.8 2006/07/12 13:17:04 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  * <code>Event</code> objects are delivered to <code>EventHandler</code>
  * services which subsrcibe to the topic of the event.
  * 
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.8 $
  */
 public class Event {
 	/**
@@ -174,8 +174,7 @@
 		}
 	}
 
-	private static final String	alphaGrammar	= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; //$NON-NLS-1$
-	private static final String	tokenGrammar	= alphaGrammar + "0123456789_"; //$NON-NLS-1$
+	private static final String	tokenAlphabet	= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"; //$NON-NLS-1$
 
 	/**
 	 * Validate a token.
@@ -184,16 +183,13 @@
 	 */
 	private void validateToken(String token) {
 		int length = token.length();
-		if (length < 1) {
+		if (length < 1) {	// token must contain at least one character
 			throw new IllegalArgumentException("invalid topic"); //$NON-NLS-1$
 		}
-		if (alphaGrammar.indexOf(token.charAt(0)) == -1) { //$NON-NLS-1$
-			throw new IllegalArgumentException("invalid topic"); //$NON-NLS-1$
-		}
-		for (int i = 1; i < length; i++) {
-			if (tokenGrammar.indexOf(token.charAt(i)) == -1) { //$NON-NLS-1$
+		for (int i = 0; i < length; i++) { // each character in the token must be from the token alphabet
+			if (tokenAlphabet.indexOf(token.charAt(i)) == -1) { //$NON-NLS-1$
 				throw new IllegalArgumentException("invalid topic"); //$NON-NLS-1$
 			}
 		}
 	}
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventAdmin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventAdmin.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventAdmin.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventAdmin.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventAdmin.java,v 1.5 2006/03/14 01:21:30 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventAdmin.java,v 1.6 2006/06/16 16:31:48 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * The Event Admin service. Bundles wishing to publish events must obtain the
  * Event Admin service and call one of the event delivery methods.
  * 
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  */
 public interface EventAdmin {
 	/**
@@ -50,4 +50,4 @@
 	 *            specified in the event.
 	 */
 	void sendEvent(Event event);
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventConstants.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventConstants.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventConstants.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventConstants.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventConstants.java,v 1.12 2006/03/14 01:21:30 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventConstants.java,v 1.14 2006/07/12 21:06:18 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
  * 
  * Defines standard names for <code>EventHandler</code> properties.
  * 
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.14 $
  */
 public interface EventConstants {
 
@@ -35,14 +35,14 @@
 	 * <p>
 	 * Event handlers SHOULD be registered with this property. The value of the
 	 * property is an array of strings that describe the topics in which the
-	 * handler is interested. An asterisk ('*') may be used as a
-	 * trailing wildcard. Event Handlers which do not have a value for this property
-	 * must not receive events. More precisely, the value of each entry in the
-	 * array must conform to the following grammar:
+	 * handler is interested. An asterisk ('*') may be used as a trailing
+	 * wildcard. Event Handlers which do not have a value for this property must
+	 * not receive events. More precisely, the value of each entry in the array
+	 * must conform to the following grammar:
 	 * 
 	 * <pre>
-	 *          topic-description := '*' | topic ( '/*' )?
-	 *          topic := token ( '/' token )*
+	 *            topic-description := '*' | topic ( '/*' )?
+	 *            topic := token ( '/' token )*
 	 * </pre>
 	 * 
 	 * @see Event
@@ -63,8 +63,8 @@
 	 * must also match the filter for the event to be delivered to the event
 	 * handler.
 	 * <p>
-	 * If the filter syntax is invalid, then the Event Handler must be ignored and a 
-	 * warning should be logged.
+	 * If the filter syntax is invalid, then the Event Handler must be ignored
+	 * and a warning should be logged.
 	 * 
 	 * @see Event
 	 * @see org.osgi.framework.Filter
@@ -82,6 +82,20 @@
 	public static final String	BUNDLE_SYMBOLICNAME	= "bundle.symbolicName";
 
 	/**
+	 * The Bundle id of the bundle relevant to the event.
+	 * 
+	 * @since 1.1
+	 */
+	public static final String	BUNDLE_ID			= "bundle.id";
+
+	/**
+	 * The Bundle object of the bundle relevant to the event.
+	 * 
+	 * @since 1.1
+	 */
+	public static final String	BUNDLE				= "bundle";
+
+	/**
 	 * The actual event object. Used when rebroadcasting an event that was sent
 	 * via some other event mechanism.
 	 */
@@ -94,15 +108,10 @@
 
 	/**
 	 * Must be equal to the name of the Exception class.
+	 * 
+	 * @since 1.1
 	 */
 	public static final String	EXCEPTION_CLASS		= "exception.class";
-	
-	/**
-	 * This constant was released with an incorrect spelling. It has been
-	 * replaced by {@link #EXCEPTION_CLASS}
-	 * @deprecated As of 1.0.1, replaced by EXCEPTION_CLASS
-	 */
-	public static final String	EXECPTION_CLASS		= "exception.class";
 
 	/**
 	 * Must be equal to exception.getMessage()
@@ -121,7 +130,7 @@
 	public static final String	SERVICE				= "service";
 
 	/**
-	 * A service’s id.
+	 * A service's id.
 	 */
 	public static final String	SERVICE_ID			= Constants.SERVICE_ID;
 
@@ -133,7 +142,7 @@
 
 	/**
 	 * 
-	 * A service’s persistent identity.
+	 * A service's persistent identity.
 	 */
 	public static final String	SERVICE_PID			= Constants.SERVICE_PID;
 
@@ -144,4 +153,11 @@
 	 */
 	public static final String	TIMESTAMP			= "timestamp";
 
+	/**
+	 * This constant was released with an incorrect spelling. It has been
+	 * replaced by {@link #EXCEPTION_CLASS}
+	 * 
+	 * @deprecated As of 1.1, replaced by EXCEPTION_CLASS
+	 */
+	public static final String	EXECPTION_CLASS		= "exception.class";
 }

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventHandler.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventHandler.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventHandler.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/EventHandler.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventHandler.java,v 1.8 2006/03/14 01:21:30 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/EventHandler.java,v 1.10 2006/07/11 16:43:59 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
  * ht.put(EVENT_TOPIC, topics);
  * context.registerService(EventHandler.class.getName(), this, ht);
  * </pre>
- * Event Handler services can also be registered with an @link EventConstants#EVENT_FILTER}
+ * Event Handler services can also be registered with an {@link EventConstants#EVENT_FILTER}
  * service propery to further filter the events. If the syntax of this filter is invalid,
  * then the Event Handler must be ignored by the Event Admin service. The Event Admin
  * service should log a warning.
@@ -55,7 +55,7 @@
  * 
  * @see Event
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  */
 public interface EventHandler {
 	/**
@@ -64,4 +64,4 @@
 	 * @param event The event that occurred.
 	 */
 	void handleEvent(Event event);
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/TopicPermission.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/TopicPermission.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/TopicPermission.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/TopicPermission.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/TopicPermission.java,v 1.10 2006/03/14 01:21:30 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/TopicPermission.java,v 1.11 2006/06/16 16:31:48 hargrave Exp $
  * 
- * Copyright (c) OSGi Alliance (2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2005, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
  * <code>TopicPermission</code> has two actions: <code>publish</code> and
  * <code>subscribe</code>.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 public final class TopicPermission extends Permission {
 	static final long			serialVersionUID	= -5855563886961618300L;
@@ -503,4 +503,4 @@
 	public Enumeration elements() {
 		return permissions.elements();
 	}
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/package.html Wed Oct 18 15:02:38 2006
@@ -1,10 +1,10 @@
-<!-- $Header: /cvshome/build/org.osgi.service.event/src/org/osgi/service/event/package.html,v 1.6 2005/11/01 18:55:09 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Event Admin Specification Version 1.0.1.
+<p>Event 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.
 For example:
 <pre>
-Import-Package: org.osgi.service.event; version=1.0.1
+Import-Package: org.osgi.service.event; version=1.1
 </pre>
 </BODY>

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/event/packageinfo Wed Oct 18 15:02:38 2006
@@ -1 +1 @@
-version 1.0.1
+version 1.1

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpContext.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpContext.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpContext.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpContext.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/HttpContext.java,v 1.9 2006/03/14 01:20:39 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/HttpContext.java,v 1.12 2006/07/12 21:22:13 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -36,7 +37,7 @@
  * <p>
  * This interface is implemented by users of the <code>HttpService</code>.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.12 $
  */
 public interface HttpContext {
 	/**
@@ -99,15 +100,15 @@
 	 * 
 	 * <p>
 	 * If the specified request has been authenticated, this method must set the
-	 * {@link #AUTHENTICATION_TYPE}request attribute to the type of
-	 * authentication used, and the {@link #REMOTE_USER}request attribute to
+	 * {@link #AUTHENTICATION_TYPE} request attribute to the type of
+	 * authentication used, and the {@link #REMOTE_USER} request attribute to
 	 * the remote user (request attributes are set using the
 	 * <code>setAttribute</code> method on the request). If this method does not
 	 * perform any authentication, it must not set these attributes.
 	 * 
 	 * <p>
 	 * If the authenticated user is also authorized to access certain resources,
-	 * this method must set the {@link #AUTHORIZATION}request attribute to the
+	 * this method must set the {@link #AUTHORIZATION} request attribute to the
 	 * <code>Authorization</code> object obtained from the
 	 * <code>org.osgi.service.useradmin.UserAdmin</code> service.
 	 * 

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/HttpService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/HttpService.java,v 1.10 2006/03/14 01:20:39 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/HttpService.java,v 1.13 2006/07/12 21:22:13 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,17 @@
  */
 package org.osgi.service.http;
 
+import java.util.Dictionary;
+
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
-import java.util.Dictionary;
 
 /**
  * The Http Service allows other bundles in the OSGi environment to dynamically
  * register resources and servlets into the URI namespace of Http Service. A
  * bundle may later unregister its resources or servlets.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.13 $
  * @see HttpContext
  */
 public interface HttpService {
@@ -132,11 +133,11 @@
 	 * returning.
 	 * <p>
 	 * If the bundle which performed the registration is stopped or otherwise
-	 * "unget"s the Http Service without calling {@link #unregister}then Http
+	 * "unget"s the Http Service without calling {@link #unregister} then Http
 	 * Service must automatically unregister the registration. However, if the
 	 * registration was for a servlet, the <code>destroy</code> method of the
 	 * servlet will not be called in this case since the bundle may be stopped.
-	 * {@link #unregister}must be explicitly called to cause the
+	 * {@link #unregister} must be explicitly called to cause the
 	 * <code>destroy</code> method of the servlet to be called. This can be done
 	 * in the <code>BundleActivator.stop</code> method of the
 	 * bundle registering the servlet.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/NamespaceException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/NamespaceException.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/NamespaceException.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/NamespaceException.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/NamespaceException.java,v 1.9 2006/03/14 01:20:39 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/NamespaceException.java,v 1.11 2006/07/11 13:15:56 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,14 @@
  * to register a servlet or resources into the URI namespace of the Http
  * Service. This exception indicates that the requested alias already is in use.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.11 $
  */
 public class NamespaceException extends Exception {
     static final long serialVersionUID = 7235606031147877747L;
 	/**
 	 * Nested exception.
 	 */
-	private Throwable	cause;
+	private final Throwable	cause;
 
 	/**
 	 * Construct a <code>NamespaceException</code> object with a detail message.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/http/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.http/src/org/osgi/service/http/package.html,v 1.3 2004/12/09 19:44:20 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Http Service Package. Specification Version 1.2.
+<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.
 For example:

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/ConnectionFactory.java,v 1.6 2006/03/14 01:20:44 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/ConnectionFactory.java,v 1.9 2006/07/12 21:22:12 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2002, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
  */
 package org.osgi.service.io;
 
-//import javax.microedition.io.*;
-import java.io.*;
+import java.io.IOException;
+
+import javax.microedition.io.Connection;
 
 /**
  * A Connection Factory service is called by the implementation of the Connector
@@ -29,11 +30,11 @@
  * of the Connector Service will examine the specified name for a scheme. The
  * Connector Service will then look for a Connection Factory service which is
  * registered with the service property <code>IO_SCHEME</code> which matches the
- * scheme. The {@link #createConnection}method of the selected Connection
+ * scheme. The {@link #createConnection} method of the selected Connection
  * Factory will then be called to create the actual <code>Connection</code>
  * object.
  * 
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.9 $
  */
 public interface ConnectionFactory {
 	/**
@@ -56,6 +57,6 @@
 	 * @throws IOException If a <code>javax.microedition.io.Connection</code>
 	 *         object can not not be created.
 	 */
-	public /*Connection*/ Object createConnection(String name, int mode, boolean timeouts)
+	public Connection createConnection(String name, int mode, boolean timeouts)
 			throws IOException;
 }

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/ConnectorService.java,v 1.7 2006/03/14 01:20:44 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/ConnectorService.java,v 1.9 2006/07/12 21:22:12 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2002, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2002, 2006). All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 package org.osgi.service.io;
 
 import java.io.*;
-//import javax.microedition.io.*;
+
+import javax.microedition.io.Connection;
+import javax.microedition.io.Connector;
 
 /**
  * The Connector Service should be called to create and open
@@ -40,7 +42,7 @@
  * first, is called. This is the same algorithm used by
  * <code>BundleContext.getServiceReference</code>.
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.9 $
  */
 public interface ConnectorService {
 	/**
@@ -48,19 +50,19 @@
 	 * 
 	 * @see "javax.microedition.io.Connector.READ"
 	 */
-	public static final int	READ		= /* Connector.READ */ 1;
+	public static final int	READ		= Connector.READ;
 	/**
 	 * Write access mode.
 	 * 
 	 * @see "javax.microedition.io.Connector.WRITE"
 	 */
-	public static final int	WRITE		= /* Connector.WRITE */ 2;
+	public static final int	WRITE		= Connector.WRITE;
 	/**
 	 * Read/Write access mode.
 	 * 
 	 * @see "javax.microedition.io.Connector.READ_WRITE"
 	 */
-	public static final int	READ_WRITE	= /* Connector.READ_WRITE */ 3;
+	public static final int	READ_WRITE	= Connector.READ_WRITE;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name.
@@ -73,7 +75,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "javax.microedition.io.Connector.open(String name)"
 	 */
-	public /* Connection */ Object open(String name) throws IOException;
+	public Connection open(String name) throws IOException;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name and
@@ -88,7 +90,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "javax.microedition.io.Connector.open(String name, int mode)"
 	 */
-	public /* Connection */ Object open(String name, int mode) throws IOException;
+	public Connection open(String name, int mode) throws IOException;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name,
@@ -105,7 +107,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "<code>javax.microedition.io.Connector.open</code>"
 	 */
-	public /* Connection */ Object open(String name, int mode, boolean timeouts)
+	public Connection open(String name, int mode, boolean timeouts)
 			throws IOException;
 
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.io/src/org/osgi/service/io/package.html,v 1.2 2004/12/01 19:01:26 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi IO Connector Specification Version 1.0.
+<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.
 For example:

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogEntry.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogEntry.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogEntry.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogEntry.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogEntry.java,v 1.8 2006/03/14 01:21:24 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogEntry.java,v 1.9 2006/06/16 16:31:49 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
  * <code>LogReaderService.getLog</code> method or by registering a
  * <code>LogListener</code> object.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * @see LogReaderService#getLog
  * @see LogListener
  */

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogListener.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogListener.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogListener.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogListener.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogListener.java,v 1.8 2006/03/14 01:21:24 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogListener.java,v 1.9 2006/06/16 16:31:49 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
  * unregistered by calling the <code>LogReaderService.removeLogListener</code>
  * method.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * @see LogReaderService
  * @see LogEntry
  * @see LogReaderService#addLogListener(LogListener)

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogReaderService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogReaderService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogReaderService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogReaderService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogReaderService.java,v 1.9 2006/03/14 01:21:24 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogReaderService.java,v 1.10 2006/06/16 16:31:49 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
  * method can be called which will return an <code>Enumeration</code> of all
  * <code>LogEntry</code> objects in the log.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  * @see LogEntry
  * @see LogListener
  * @see LogListener#logged(LogEntry)

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/LogService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogService.java,v 1.8 2006/03/14 01:21:24 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/LogService.java,v 1.9 2006/06/16 16:31:49 hargrave Exp $
  *
- * Copyright (c) OSGi Alliance (2000, 2005). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2000, 2006). All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
  * <li>{@link #LOG_DEBUG}
  * </ol>
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
 public interface LogService {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/log/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.log/src/org/osgi/service/log/package.html,v 1.3 2005/08/10 01:43:20 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Log Service Package. Specification Version 1.3.
+<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:



Mime
View raw message