felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r465395 [2/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
Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/AttributeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/AttributeDefinition.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/AttributeDefinition.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/AttributeDefinition.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/AttributeDefinition.java,v 1.11 2006/03/14 01:20:46 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/AttributeDefinition.java,v 1.13 2006/06/16 16:31:23 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.
@@ -24,7 +24,7 @@
  * An <code>AttributeDefinition</code> object defines a description of the data
  * type of a property/attribute.
  * 
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.13 $
  */
 public interface AttributeDefinition {
 	/**
@@ -99,7 +99,7 @@
 	 * <code>Vector</code> with <code>BigInteger</code> or <code>BigInteger[]</code>
 	 * objects, depending on the <code>getCardinality()</code> value.
 	 * 
-	 * @deprecated Since 1.1
+	 * @deprecated As of 1.1.
 	 */
 	public static final int	BIGINTEGER	= 9;
 	/**
@@ -109,7 +109,7 @@
 	 * <code>Vector</code> with <code>BigDecimal</code> or <code>BigDecimal[]</code>
 	 * objects depending on <code>getCardinality()</code>.
 	 * 
-	 * @deprecated Since 1.1
+	 * @deprecated As of 1.1.
 	 */
 	public static final int	BIGDECIMAL	= 10;
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeInformation.java,v 1.7 2006/03/14 01:20:46 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeInformation.java,v 1.8 2006/06/16 16:31:23 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.
@@ -23,7 +23,7 @@
  * A MetaType Information object is created by the MetaTypeService to return
  * meta type information for a specific bundle.
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  * @since 1.1
  */
 public interface MetaTypeInformation extends MetaTypeProvider {
@@ -49,4 +49,4 @@
 	 * @return Bundle for which this object provides meta type information.
 	 */
 	public Bundle getBundle();
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeProvider.java,v 1.10 2006/03/14 01:20:46 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeProvider.java,v 1.11 2006/06/16 16:31:23 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.
@@ -20,7 +20,7 @@
 /**
  * Provides access to metatypes.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 public interface MetaTypeProvider {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/MetaTypeService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeService.java,v 1.9 2006/03/14 01:20:46 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/MetaTypeService.java,v 1.10 2006/06/16 16:31:23 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.
@@ -33,7 +33,7 @@
  * retrieve meta type information for bundles which contain a meta type
  * documents or which provide their own <code>MetaTypeProvider</code> objects.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  * @since 1.1
  */
 public interface MetaTypeService {
@@ -50,4 +50,4 @@
 	 * entry in the meta type documents directory.
 	 */
 	public final static String	METATYPE_DOCUMENTS_LOCATION	= "OSGI-INF/metatype";
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/ObjectClassDefinition.java,v 1.10 2006/03/14 01:20:46 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.metatype/src/org/osgi/service/metatype/ObjectClassDefinition.java,v 1.11 2006/06/16 16:31:23 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 @@
 /**
  * Description for the data type information of an objectclass.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
  */
 public interface ObjectClassDefinition {
 	/**

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

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/BackingStoreException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/BackingStoreException.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/BackingStoreException.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/BackingStoreException.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/BackingStoreException.java,v 1.10 2006/03/14 01:21:15 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/BackingStoreException.java,v 1.12 2006/07/11 13:15:55 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,14 +21,14 @@
  * Thrown to indicate that a preferences operation could not complete because of
  * a failure in the backing store, or a failure to contact the backing store.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.12 $
  */
 public class BackingStoreException extends Exception {
     static final long serialVersionUID = -1415637364122829574L;
 	/**
 	 * Nested exception.
 	 */
-	private Throwable	cause;
+	private final Throwable	cause;
 
 	/**
 	 * Constructs a <code>BackingStoreException</code> with the specified detail
@@ -38,6 +38,7 @@
 	 */
 	public BackingStoreException(String s) {
 		super(s);
+		this.cause = null;
 	}
 	
 	/**
@@ -79,4 +80,4 @@
 		throw new IllegalStateException();
 	}
 
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/Preferences.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/Preferences.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/Preferences.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/Preferences.java,v 1.9 2006/03/14 01:21:15 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/Preferences.java,v 1.11 2006/07/11 00:54:04 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.
@@ -110,7 +110,7 @@
  * preference data.
  * 
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.11 $
  */
 public interface Preferences {
 	/**
@@ -121,7 +121,7 @@
 	 * @throws NullPointerException if <code>key</code> or <code>value</code> is
 	 *         <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 */
 	public void put(String key, String value);
 
@@ -137,7 +137,7 @@
 	 * @return the value associated with <code>key</code>, or <code>def</code> if
 	 *         no value is associated with <code>key</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>. (A
 	 *         <code>null</code> default <i>is </i> permitted.)
 	 */
@@ -150,7 +150,7 @@
 	 * @param key key whose mapping is to be removed from this node.
 	 * @see #get(String,String)
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 */
 	public void remove(String key);
 
@@ -162,7 +162,7 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #remove(String)
 	 */
 	public void clear() throws BackingStoreException;
@@ -172,7 +172,7 @@
 	 * <code>int</code> value with the specified <code>key</code> in this node. The
 	 * associated string is the one that would be returned if the <code>int</code>
 	 * value were passed to <code>Integer.toString(int)</code>. This method is
-	 * intended for use in conjunction with {@link #getInt}method.
+	 * intended for use in conjunction with {@link #getInt} method.
 	 * 
 	 * <p>
 	 * Implementor's note: it is <i>not </i> necessary that the property value
@@ -188,7 +188,7 @@
 	 *        <code>key</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getInt(String,int)
 	 */
 	public void putInt(String key, int value);
@@ -202,7 +202,7 @@
 	 * is inaccessible, or if <code>Integer.parseInt(String)</code> would throw a
 	 * <code>NumberFormatException</code> if the associated <code>value</code> were
 	 * passed. This method is intended for use in conjunction with the
-	 * {@link #putInt}method.
+	 * {@link #putInt} method.
 	 * 
 	 * @param key key whose associated value is to be returned as an
 	 *        <code>int</code>.
@@ -216,7 +216,7 @@
 	 *         be interpreted as an <code>int</code> type.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #putInt(String,int)
 	 * @see #get(String,String)
 	 */
@@ -245,7 +245,7 @@
 	 *        <code>key</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getLong(String,long)
 	 */
 	public void putLong(String key, long value);
@@ -259,7 +259,7 @@
 	 * is inaccessible, or if <code>Long.parseLong(String)</code> would throw a
 	 * <code>NumberFormatException</code> if the associated <code>value</code> were
 	 * passed. This method is intended for use in conjunction with the
-	 * {@link #putLong}method.
+	 * {@link #putLong} method.
 	 * 
 	 * @param key <code>key</code> whose associated value is to be returned as a
 	 *        <code>long</code> value.
@@ -273,7 +273,7 @@
 	 *         be interpreted as a <code>long</code> type.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #putLong(String,long)
 	 * @see #get(String,String)
 	 */
@@ -284,7 +284,7 @@
 	 * <code>boolean</code> value with the specified key in this node. The
 	 * associated string is "true" if the value is <code>true</code>, and "false"
 	 * if it is <code>false</code>. This method is intended for use in
-	 * conjunction with the {@link #getBoolean}method.
+	 * conjunction with the {@link #getBoolean} method.
 	 * 
 	 * <p>
 	 * Implementor's note: it is <i>not </i> necessary that the value be
@@ -301,7 +301,7 @@
 	 *        <code>key</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getBoolean(String,boolean)
 	 * @see #get(String,String)
 	 */
@@ -313,7 +313,7 @@
 	 * strings are "true", which represents <code>true</code>, and "false", which
 	 * represents <code>false</code>. Case is ignored, so, for example, "TRUE"
 	 * and "False" are also valid. This method is intended for use in
-	 * conjunction with the {@link #putBoolean}method.
+	 * conjunction with the {@link #putBoolean} method.
 	 * 
 	 * <p>
 	 * Returns the specified default if there is no value associated with the
@@ -332,7 +332,7 @@
 	 *         be interpreted as a <code>boolean</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #get(String,String)
 	 * @see #putBoolean(String,boolean)
 	 */
@@ -344,7 +344,7 @@
 	 * The associated <code>String</code> object is the one that would be returned
 	 * if the <code>float</code> value were passed to
 	 * <code>Float.toString(float)</code>. This method is intended for use in
-	 * conjunction with the {@link #getFloat}method.
+	 * conjunction with the {@link #getFloat} method.
 	 * 
 	 * <p>
 	 * Implementor's note: it is <i>not </i> necessary that the value be
@@ -360,7 +360,7 @@
 	 *        <code>key</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getFloat(String,float)
 	 */
 	public void putFloat(String key, float value);
@@ -387,7 +387,7 @@
 	 *         associated value does not exist or cannot be interpreted as a
 	 *         <code>float</code> type.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @see #putFloat(String,float)
 	 * @see #get(String,String)
@@ -400,7 +400,7 @@
 	 * The associated <code>String</code> object is the one that would be returned
 	 * if the <code>double</code> value were passed to
 	 * <code>Double.toString(double)</code>. This method is intended for use in
-	 * conjunction with the {@link #getDouble}method
+	 * conjunction with the {@link #getDouble} method
 	 * 
 	 * <p>
 	 * Implementor's note: it is <i>not </i> necessary that the value be
@@ -417,7 +417,7 @@
 	 *        <code>key</code>.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getDouble(String,double)
 	 */
 	public void putDouble(String key, double value);
@@ -431,7 +431,7 @@
 	 * is inaccessible, or if <code>Double.parseDouble(String)</code> would throw
 	 * a <code>NumberFormatException</code> if the associated value were passed.
 	 * This method is intended for use in conjunction with the
-	 * {@link #putDouble}method.
+	 * {@link #putDouble} method.
 	 * 
 	 * @param key <code>key</code> whose associated value is to be returned as a
 	 *        <code>double</code> value.
@@ -444,7 +444,7 @@
 	 *         <code>def</code> if the associated value does not exist or cannot
 	 *         be interpreted as a <code>double</code> type.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the the {@link #removeNode()}method.
+	 *         removed with the the {@link #removeNode()} method.
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>.
 	 * @see #putDouble(String,double)
 	 * @see #get(String,String)
@@ -460,7 +460,7 @@
 	 * with one minor change: the string will consist solely of characters from
 	 * the <i>Base64 Alphabet </i>; it will not contain any newline characters.
 	 * This method is intended for use in conjunction with the
-	 * {@link #getByteArray}method.
+	 * {@link #getByteArray} method.
 	 * 
 	 * <p>
 	 * Implementor's note: it is <i>not </i> necessary that the value be
@@ -478,7 +478,7 @@
 	 * @throws NullPointerException if <code>key</code> or <code>value</code> is
 	 *         <code>null</code>.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #getByteArray(String,byte[])
 	 * @see #get(String,String)
 	 */
@@ -492,7 +492,7 @@
 	 * Section 6.8, with one minor change: the string must consist solely of
 	 * characters from the <i>Base64 Alphabet </i>; no newline characters or
 	 * extraneous characters are permitted. This method is intended for use in
-	 * conjunction with the {@link #putByteArray}method.
+	 * conjunction with the {@link #putByteArray} method.
 	 * 
 	 * <p>
 	 * Returns the specified default if there is no value associated with the
@@ -512,7 +512,7 @@
 	 * @throws NullPointerException if <code>key</code> is <code>null</code>. (A
 	 *         <code>null</code> value for <code>def</code> <i>is </i> permitted.)
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #get(String,String)
 	 * @see #putByteArray(String,byte[])
 	 */
@@ -528,7 +528,7 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 */
 	public String[] keys() throws BackingStoreException;
 
@@ -541,7 +541,7 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 */
 	public String[] childrenNames() throws BackingStoreException;
 
@@ -550,7 +550,7 @@
 	 * 
 	 * @return the parent of this node.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 */
 	public Preferences parent();
 
@@ -574,7 +574,7 @@
 	 * @return the specified <code>Preferences</code> object.
 	 * @throws IllegalArgumentException if the path name is invalid.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @throws NullPointerException if path name is <code>null</code>.
 	 * @see #flush()
 	 */
@@ -590,7 +590,7 @@
 	 * 
 	 * <p>
 	 * If this node (or an ancestor) has already been removed with the
-	 * {@link #removeNode()}method, it <i>is </i> legal to invoke this method,
+	 * {@link #removeNode()} method, it <i>is </i> legal to invoke this method,
 	 * but only with the pathname <code>""</code>; the invocation will return
 	 * <code>false</code>. Thus, the idiom <code>p.nodeExists("")</code> may be
 	 * used to test whether <code>p</code> has been removed.
@@ -602,7 +602,7 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method and
+	 *         removed with the {@link #removeNode()} method and
 	 *         <code>pathname</code> is not the empty string (<code>""</code>).
 	 * @throws IllegalArgumentException if the path name is invalid (i.e., it
 	 *         contains multiple consecutive slash characters, or ends with a
@@ -625,7 +625,7 @@
 	 * method is called on the parent of this node.
 	 * 
 	 * @throws IllegalStateException if this node (or an ancestor) has already
-	 *         been removed with the {@link #removeNode()}method.
+	 *         been removed with the {@link #removeNode()} method.
 	 * @throws BackingStoreException if this operation cannot be completed due
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
@@ -679,7 +679,7 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #sync()
 	 */
 	public void flush() throws BackingStoreException;
@@ -695,8 +695,8 @@
 	 *         to a failure in the backing store, or inability to communicate
 	 *         with it.
 	 * @throws IllegalStateException if this node (or an ancestor) has been
-	 *         removed with the {@link #removeNode()}method.
+	 *         removed with the {@link #removeNode()} method.
 	 * @see #flush()
 	 */
 	public void sync() throws BackingStoreException;
-}
\ No newline at end of file
+}

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/PreferencesService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/PreferencesService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/PreferencesService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/prefs/PreferencesService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/PreferencesService.java,v 1.9 2006/03/14 01:21:15 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.prefs/src/org/osgi/service/prefs/PreferencesService.java,v 1.10 2006/06/16 16:31:30 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.

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

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/ProvisioningService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/ProvisioningService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/ProvisioningService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/ProvisioningService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.provisioning/src/org/osgi/service/provisioning/ProvisioningService.java,v 1.9 2006/03/14 01:21:04 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.provisioning/src/org/osgi/service/provisioning/ProvisioningService.java,v 1.11 2006/07/12 21:21:31 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,9 +17,9 @@
  */
 package org.osgi.service.provisioning;
 
+import java.io.IOException;
 import java.util.Dictionary;
 import java.util.zip.ZipInputStream;
-import java.io.IOException;
 
 /**
  * Service for managing the initial provisioning information.
@@ -58,7 +58,7 @@
  * the provisioning information, so care must be taken not to leak the
  * Provisioning Dictionary received from <code>getInformation</code> method.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.11 $
  */
 public interface ProvisioningService {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/provisioning/package.html Wed Oct 18 15:02:38 2006
@@ -1,6 +1,6 @@
-<!-- $Header: /cvshome/build/org.osgi.service.provisioning/src/org/osgi/service/provisioning/package.html,v 1.3 2005/08/10 02:16:40 hargrave Exp $ -->
+<!-- $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 $ -->
 <BODY>
-<P>The OSGi Provisioning Service Package. Specification Version 1.1.
+<p>Provisioning 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/upnp/UPnPAction.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPAction.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPAction.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPAction.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPAction.java,v 1.9 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPAction.java,v 1.10 2006/06/16 16:31:46 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.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPDevice.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPDevice.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPDevice.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPDevice.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPDevice.java,v 1.8 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPDevice.java,v 1.9 2006/06/16 16:31:46 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.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPEventListener.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPEventListener.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPEventListener.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPEventListener.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPEventListener.java,v 1.7 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPEventListener.java,v 1.8 2006/06/16 16:31:46 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.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPException.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPException.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPException.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPException.java,v 1.11 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPException.java,v 1.14 2006/07/12 21:21:34 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.
@@ -17,7 +17,6 @@
  */
 package org.osgi.service.upnp;
 
-import java.lang.Exception;
 
 /**
  * There are several defined error situations describing UPnP problems while a
@@ -58,7 +57,7 @@
 	 * Key for an error information that is an int type variable and that is
 	 * used to identify occured errors.
 	 */
-	private int				errorCode;
+	private final int				errorCode;
 
 	/**
 	 * This constructor creates a UPnPException on the specified error code and

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPIcon.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPIcon.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPIcon.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPIcon.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPIcon.java,v 1.10 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPIcon.java,v 1.12 2006/07/12 21:21:34 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,8 @@
  */
 package org.osgi.service.upnp;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * A UPnP icon representation.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPLocalStateVariable.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPLocalStateVariable.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPLocalStateVariable.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPLocalStateVariable.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPLocalStateVariable.java,v 1.11 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPLocalStateVariable.java,v 1.12 2006/06/16 16:31:46 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.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPService.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPService.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPService.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPService.java,v 1.7 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPService.java,v 1.8 2006/06/16 16:31:46 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.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPStateVariable.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPStateVariable.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPStateVariable.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/upnp/UPnPStateVariable.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPStateVariable.java,v 1.7 2006/03/14 01:21:11 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.upnp/src/org/osgi/service/upnp/UPnPStateVariable.java,v 1.8 2006/06/16 16:31:46 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.

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

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Authorization.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Authorization.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Authorization.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Authorization.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Authorization.java,v 1.7 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Authorization.java,v 1.9 2006/07/11 00:54:01 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.
@@ -27,7 +27,7 @@
  * the required role, by calling its <code>hasRole</code> method.
  * <p>
  * Authorization contexts are instantiated by calling the
- * {@link UserAdmin#getAuthorization}method.
+ * {@link UserAdmin#getAuthorization} method.
  * 
  * <p>
  * <i>Trusting Authorization objects </i>
@@ -60,14 +60,14 @@
  * <code>Authorization</code> object), the service explicitly checks that the
  * calling bundle has permission to make the call.
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.9 $
  */
 public interface Authorization {
 	/**
-	 * Gets the name of the {@link User}that this <code>Authorization</code>
+	 * Gets the name of the {@link User} that this <code>Authorization</code>
 	 * context was created for.
 	 * 
-	 * @return The name of the {@link User}object that this
+	 * @return The name of the {@link User} object that this
 	 *         <code>Authorization</code> context was created for, or
 	 *         <code>null</code> if no user was specified when this
 	 *         <code>Authorization</code> context was created.
@@ -82,7 +82,7 @@
 	 * Bundles must define globally unique role names that are associated with
 	 * the privilege of accessing restricted resources or operations. Operators
 	 * will grant users access to these resources, by creating a {@link Group}
-	 * object for each role and adding {@link User}objects to it.
+	 * object for each role and adding {@link User} objects to it.
 	 * 
 	 * @param name The name of the role to check for.
 	 * 

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Group.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Group.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Group.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Group.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Group.java,v 1.7 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Group.java,v 1.8 2006/06/16 16:31:41 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.
@@ -87,7 +87,7 @@
  *  
  * </pre>
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  */
 public interface Group extends User {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Role.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Role.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Role.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/Role.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Role.java,v 1.8 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/Role.java,v 1.10 2006/07/11 00:54:01 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 @@
  * classes: a name, a type, and a set of properties.
  * <p>
  * Properties represent public information about the <code>Role</code> object that
- * can be read by anyone. Specific {@link UserAdminPermission}objects are
+ * can be read by anyone. Specific {@link UserAdminPermission} objects are
  * required to change a <code>Role</code> object's properties.
  * <p>
  * <code>Role</code> object properties are <code>Dictionary</code> objects. Changes
@@ -47,7 +47,7 @@
  * <code>UserAdminPermission</code> in the same way that properties for other
  * <code>Role</code> objects are.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  */
 public interface Role {
 	/**
@@ -64,14 +64,14 @@
 	 */
 	public static final int		ROLE		= 0;
 	/**
-	 * The type of a {@link User}role.
+	 * The type of a {@link User} role.
 	 * 
 	 * <p>
 	 * The value of <code>USER</code> is 1.
 	 */
 	public static final int		USER		= 1;
 	/**
-	 * The type of a {@link Group}role.
+	 * The type of a {@link Group} role.
 	 * 
 	 * <p>
 	 * The value of <code>GROUP</code> is 2.
@@ -97,7 +97,7 @@
 	 * <code>Role</code> object. Any changes to the returned <code>Dictionary</code>
 	 * will change the properties of this <code>Role</code> object. This will
 	 * cause a <code>UserAdminEvent</code> object of type
-	 * {@link UserAdminEvent#ROLE_CHANGED}to be broadcast to any
+	 * {@link UserAdminEvent#ROLE_CHANGED} to be broadcast to any
 	 * <code>UserAdminListener</code> objects.
 	 * 
 	 * <p>
@@ -108,7 +108,7 @@
 	 * 
 	 * <p>
 	 * In order to add, change, or remove a property in the returned
-	 * <code>Dictionary</code>, a {@link UserAdminPermission}named after the
+	 * <code>Dictionary</code>, a {@link UserAdminPermission} named after the
 	 * property name (or a prefix of it) with action <code>changeProperty</code>
 	 * is required.
 	 * 

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/User.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/User.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/User.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/User.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/User.java,v 1.7 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/User.java,v 1.9 2006/07/11 00:54:01 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.
@@ -32,14 +32,14 @@
  * User Admin services.
  * <p>
  * A <code>User</code> object may have credentials (and properties, inherited from
- * the {@link Role}class) associated with it. Specific
- * {@link UserAdminPermission}objects are required to read or change a
+ * the {@link Role} class) associated with it. Specific
+ * {@link UserAdminPermission} objects are required to read or change a
  * <code>User</code> object's credentials.
  * <p>
  * Credentials are <code>Dictionary</code> objects and have semantics that are
  * similar to the properties in the <code>Role</code> class.
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.9 $
  */
 public interface User extends Role {
 	/**
@@ -47,7 +47,7 @@
 	 * object. Any changes to the returned <code>Dictionary</code> object will
 	 * change the credentials of this <code>User</code> object. This will cause a
 	 * <code>UserAdminEvent</code> object of type
-	 * {@link UserAdminEvent#ROLE_CHANGED}to be broadcast to any
+	 * {@link UserAdminEvent#ROLE_CHANGED} to be broadcast to any
 	 * <code>UserAdminListeners</code> objects.
 	 * 
 	 * <p>
@@ -58,11 +58,11 @@
 	 * 
 	 * <p>
 	 * In order to retrieve a credential from the returned <code>Dictionary</code>
-	 * object, a {@link UserAdminPermission}named after the credential name (or
+	 * object, a {@link UserAdminPermission} named after the credential name (or
 	 * a prefix of it) with action <code>getCredential</code> is required.
 	 * <p>
 	 * In order to add or remove a credential from the returned
-	 * <code>Dictionary</code> object, a {@link UserAdminPermission}named after
+	 * <code>Dictionary</code> object, a {@link UserAdminPermission} named after
 	 * the credential name (or a prefix of it) with action
 	 * <code>changeCredential</code> is required.
 	 * 

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdmin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdmin.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdmin.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdmin.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdmin.java,v 1.9 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdmin.java,v 1.12 2006/07/12 21:21:33 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.
@@ -17,7 +17,7 @@
  */
 package org.osgi.service.useradmin;
 
-import org.osgi.framework.*;
+import org.osgi.framework.InvalidSyntaxException;
 
 /**
  * This interface is used to manage a database of named <code>Role</code> objects,
@@ -34,18 +34,18 @@
  * Every role has a name and a type.
  * 
  * <p>
- * A {@link User}object can be configured with credentials (e.g., a password)
+ * A {@link User} object can be configured with credentials (e.g., a password)
  * and properties (e.g., a street address, phone number, etc.).
  * <p>
- * A {@link Group}object represents an aggregation of {@link User}and
- * {@link Group}objects. In other words, the members of a <code>Group</code>
+ * A {@link Group} object represents an aggregation of {@link User} and
+ * {@link Group} objects. In other words, the members of a <code>Group</code>
  * object are roles themselves.
  * <p>
  * Every User Admin service manages and maintains its own namespace of
  * <code>Role</code> objects, in which each <code>Role</code> object has a unique
  * name.
  * 
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.12 $
  */
 public interface UserAdmin {
 	/**
@@ -54,12 +54,12 @@
 	 * 
 	 * <p>
 	 * If a <code>Role</code> object was created, a <code>UserAdminEvent</code>
-	 * object of type {@link UserAdminEvent#ROLE_CREATED}is broadcast to any
+	 * object of type {@link UserAdminEvent#ROLE_CREATED} is broadcast to any
 	 * <code>UserAdminListener</code> object.
 	 * 
 	 * @param name The <code>name</code> of the <code>Role</code> object to create.
 	 * @param type The type of the <code>Role</code> object to create. Must be
-	 *        either a {@link Role#USER}type or {@link Role#GROUP}type.
+	 *        either a {@link Role#USER} type or {@link Role#GROUP} type.
 	 * 
 	 * @return The newly created <code>Role</code> object, or <code>null</code> if a
 	 *         role with the given name already exists.
@@ -78,7 +78,7 @@
 	 * 
 	 * <p>
 	 * If the <code>Role</code> object was removed, a <code>UserAdminEvent</code>
-	 * object of type {@link UserAdminEvent#ROLE_REMOVED}is broadcast to any
+	 * object of type {@link UserAdminEvent#ROLE_REMOVED} is broadcast to any
 	 * <code>UserAdminListener</code> object.
 	 * 
 	 * @param name The name of the <code>Role</code> object to remove.

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminEvent.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminEvent.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminEvent.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminEvent.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminEvent.java,v 1.7 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminEvent.java,v 1.9 2006/07/11 00:54:01 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,14 +28,14 @@
  * 
  * <p>
  * A type code is used to identify the event. The following event types are
- * defined: {@link #ROLE_CREATED}type, {@link #ROLE_CHANGED}type, and
- * {@link #ROLE_REMOVED}type. Additional event types may be defined in the
+ * defined: {@link #ROLE_CREATED} type, {@link #ROLE_CHANGED} type, and
+ * {@link #ROLE_REMOVED} type. Additional event types may be defined in the
  * future.
  * 
  * @see UserAdmin
  * @see UserAdminListener
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.9 $
  */
 public class UserAdminEvent {
 	private ServiceReference	ref;
@@ -93,8 +93,8 @@
 	 * Returns the type of this event.
 	 * 
 	 * <p>
-	 * The type values are {@link #ROLE_CREATED}type, {@link #ROLE_CHANGED}
-	 * type, and {@link #ROLE_REMOVED}type.
+	 * The type values are {@link #ROLE_CREATED} type, {@link #ROLE_CHANGED}
+	 * type, and {@link #ROLE_REMOVED} type.
 	 * 
 	 * @return The event type.
 	 */

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminListener.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminListener.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminListener.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminListener.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminListener.java,v 1.7 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminListener.java,v 1.8 2006/06/16 16:31:41 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.
@@ -32,7 +32,7 @@
  * @see UserAdmin
  * @see UserAdminEvent
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  */
 public interface UserAdminListener {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminPermission.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminPermission.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminPermission.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/useradmin/UserAdminPermission.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminPermission.java,v 1.10 2006/03/14 01:20:47 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.useradmin/src/org/osgi/service/useradmin/UserAdminPermission.java,v 1.13 2006/07/12 21:21:33 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.
@@ -18,20 +18,18 @@
 package org.osgi.service.useradmin;
 
 import java.io.IOException;
-import java.util.Hashtable;
+import java.security.*;
 import java.util.Enumeration;
-import java.security.Permission;
-import java.security.BasicPermission;
-import java.security.PermissionCollection;
+import java.util.Hashtable;
 
 /**
- * Permission to configure and access the {@link Role}objects managed by a User
+ * Permission to configure and access the {@link Role} objects managed by a User
  * Admin service.
  * 
  * <p>
  * This class represents access to the <code>Role</code> objects managed by a User
  * Admin service and their properties and credentials (in the case of
- * {@link User}objects).
+ * {@link User} objects).
  * <p>
  * The permission name is the name (or name prefix) of a property or credential.
  * The naming convention follows the hierarchical property naming convention.
@@ -116,7 +114,7 @@
  * validate any password credentials (for authentication purposes), but the
  * bundle is not allowed to change any properties or credentials.
  * 
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.13 $
  */
 public final class UserAdminPermission extends BasicPermission {
     static final long serialVersionUID = -1179971692401603789L;

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

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/BasicEnvelope.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/BasicEnvelope.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/BasicEnvelope.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/BasicEnvelope.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/BasicEnvelope.java,v 1.8 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/BasicEnvelope.java,v 1.9 2006/06/16 16:31:43 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.
@@ -21,7 +21,7 @@
  * <code>BasicEnvelope</code> is an implementation of the {@link Envelope}
  * interface
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
 public class BasicEnvelope implements Envelope {
 	Object	value;

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Consumer.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Consumer.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Consumer.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Consumer.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Consumer.java,v 1.8 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Consumer.java,v 1.10 2006/07/11 00:54:10 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.
@@ -19,27 +19,27 @@
 
 /**
  * Data Consumer, a service that can receive udpated values from
- * {@link Producer}services.
+ * {@link Producer} services.
  * 
  * <p>
  * Service objects registered under the <code>Consumer</code> interface are
  * expected to consume values from a Producer service via a <code>Wire</code>
  * object. A Consumer service may poll the Producer service by calling the
- * {@link Wire#poll}method. The Consumer service will also receive an updated
- * value when called at it's {@link #updated}method. The Producer service
+ * {@link Wire#poll} method. The Consumer service will also receive an updated
+ * value when called at it's {@link #updated} method. The Producer service
  * should have coerced the value to be an instance of one of the types specified
- * by the {@link Wire#getFlavors}method, or one of their subclasses.
+ * by the {@link Wire#getFlavors} method, or one of their subclasses.
  * 
  * <p>
  * Consumer service objects must register with a <code>service.pid</code> and a
- * {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS}property. It is recommended
+ * {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS} property. It is recommended
  * that Consumer service objects also register with a
  * <code>service.description</code> property.
  * 
  * <p>
  * If an <code>Exception</code> is thrown by any of the <code>Consumer</code>
  * methods, a <code>WireAdminEvent</code> of type
- * {@link WireAdminEvent#CONSUMER_EXCEPTION}is broadcast by the Wire Admin
+ * {@link WireAdminEvent#CONSUMER_EXCEPTION} is broadcast by the Wire Admin
  * service.
  * 
  * <p>
@@ -53,7 +53,7 @@
  * different types of objects from the Producer service. The Consumer service
  * should have <code>WirePermission</code> for each of these scope names.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  */
 public interface Consumer {
 	/**
@@ -63,7 +63,7 @@
 	 * <p>
 	 * Note: This method may be called by a <code>Wire</code> object prior to this
 	 * object being notified that it is connected to that <code>Wire</code> object
-	 * (via the {@link #producersConnected}method).
+	 * (via the {@link #producersConnected} method).
 	 * <p>
 	 * When the Consumer service can receive <code>Envelope</code> objects, it
 	 * must have registered all scope names together with the service object,
@@ -75,7 +75,7 @@
 	 * @param wire The <code>Wire</code> object which is delivering the updated
 	 *        value.
 	 * @param value The updated value. The value should be an instance of one of
-	 *        the types specified by the {@link Wire#getFlavors}method.
+	 *        the types specified by the {@link Wire#getFlavors} method.
 	 */
 	public void updated(Wire wire, Object value);
 

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Envelope.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Envelope.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Envelope.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Envelope.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Envelope.java,v 1.7 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Envelope.java,v 1.8 2006/06/16 16:31:43 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.
@@ -45,7 +45,7 @@
  * @see WirePermission
  * @see BasicEnvelope
  * 
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
  */
 public interface Envelope {
 	/**

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Producer.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Producer.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Producer.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Producer.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Producer.java,v 1.8 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Producer.java,v 1.10 2006/07/11 00:54:10 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.
@@ -19,7 +19,7 @@
 
 /**
  * Data Producer, a service that can generate values to be used by
- * {@link Consumer}services.
+ * {@link Consumer} services.
  * 
  * <p>
  * Service objects registered under the Producer interface are expected to
@@ -33,7 +33,7 @@
  * When the data represented by the Producer object changes, this object should
  * send the updated value by calling the <code>update</code> method on each of
  * <code>Wire</code> objects passed in the most recent call to this object's
- * {@link #consumersConnected}method. These <code>Wire</code> objects will pass
+ * {@link #consumersConnected} method. These <code>Wire</code> objects will pass
  * the value on to the associated <code>Consumer</code> service object.
  * 
  * <p>
@@ -42,10 +42,10 @@
  * 
  * <p>
  * Producer service objects must register with a <code>service.pid</code> and a
- * {@link WireConstants#WIREADMIN_PRODUCER_FLAVORS}property. It is recommended
+ * {@link WireConstants#WIREADMIN_PRODUCER_FLAVORS} property. It is recommended
  * that a Producer service object also registers with a
  * <code>service.description</code> property. Producer service objects must
- * register with a {@link WireConstants#WIREADMIN_PRODUCER_FILTERS}property if
+ * register with a {@link WireConstants#WIREADMIN_PRODUCER_FILTERS} property if
  * the Producer service will be performing filtering instead of the
  * <code>Wire</code> object.
  * 
@@ -66,7 +66,7 @@
  * different types of objects (composite) to the Consumer service. The Producer
  * service should have <code>WirePermission</code> for each of these scope names.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  */
 public interface Producer {
 	/**
@@ -83,7 +83,7 @@
 	 * <p>
 	 * Note: This method may be called by a <code>Wire</code> object prior to this
 	 * object being notified that it is connected to that <code>Wire</code> object
-	 * (via the {@link #consumersConnected}method).
+	 * (via the {@link #consumersConnected} method).
 	 * <p>
 	 * If the Producer service returns an <code>Envelope</code> object that has an
 	 * unpermitted scope name, then the Wire object must ignore (or remove) the

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Wire.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Wire.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Wire.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/Wire.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Wire.java,v 1.8 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/Wire.java,v 1.10 2006/07/11 00:54:10 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.
@@ -28,8 +28,8 @@
  * <code>service.pid</code> values. The Producer and Consumer services may
  * communicate with each other via <code>Wire</code> objects that connect them.
  * The Producer service may send updated values to the Consumer service by
- * calling the {@link #update}method. The Consumer service may request an
- * updated value from the Producer service by calling the {@link #poll}method.
+ * calling the {@link #update} method. The Consumer service may request an
+ * updated value from the Producer service by calling the {@link #poll} method.
  * 
  * <p>
  * A Producer service and a Consumer service may be connected through multiple
@@ -55,7 +55,7 @@
  * is used in communication. The semantics of the names depend on the Producer
  * service and must not be interpreted by the Wire Admin service.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.10 $
  */
 public interface Wire {
 	/**
@@ -92,7 +92,7 @@
 	 * deleted.
 	 * <p>
 	 * A <code>WireAdminEvent</code> of type
-	 * {@link WireAdminEvent#WIRE_DISCONNECTED}must be broadcast by the Wire
+	 * {@link WireAdminEvent#WIRE_DISCONNECTED} must be broadcast by the Wire
 	 * Admin service when the <code>Wire</code> becomes disconnected.
 	 * 
 	 * @return <code>true</code> if both the Producer and Consumer for this
@@ -108,7 +108,7 @@
 	 * 
 	 * <p>
 	 * The list is the value of the
-	 * {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS}service property of the
+	 * {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS} service property of the
 	 * Consumer service object connected to this object. If no such property was
 	 * registered or the type of the property value is not <code>Class[]</code>,
 	 * this method must return <code>null</code>.
@@ -116,7 +116,7 @@
 	 * @return An array containing the list of classes understood by the
 	 *         Consumer service or <code>null</code> if the <code>Wire</code> is not
 	 *         connected, or the consumer did not register a
-	 *         {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS}property or the
+	 *         {@link WireConstants#WIREADMIN_CONSUMER_FLAVORS} property or the
 	 *         value of the property is not of type <code>Class[]</code>.
 	 */
 	public Class[] getFlavors();
@@ -129,7 +129,7 @@
 	 * service connected to this <code>Wire</code> object of an updated value.
 	 * <p>
 	 * If the properties of this <code>Wire</code> object contain a
-	 * {@link WireConstants#WIREADMIN_FILTER}property, then filtering is
+	 * {@link WireConstants#WIREADMIN_FILTER} property, then filtering is
 	 * performed. If the Producer service connected to this <code>Wire</code>
 	 * object was registered with the service property
 	 * {@link WireConstants#WIREADMIN_PRODUCER_FILTERS}, the Producer service
@@ -139,7 +139,7 @@
 	 * <p>
 	 * If no filtering is done, or the filter indicates the updated value should
 	 * be delivered to the Consumer service, then this <code>Wire</code> object
-	 * must call the {@link Consumer#updated}method with the updated value. If
+	 * must call the {@link Consumer#updated} method with the updated value. If
 	 * this <code>Wire</code> object is not connected, then the Consumer service
 	 * must not be called and the value is ignored.
 	 * <p>
@@ -196,7 +196,7 @@
 	 * 
 	 * <p>
 	 * The returned value is the most recent, valid value passed to the
-	 * {@link #update}method or returned by the {@link #poll}method of this
+	 * {@link #update} method or returned by the {@link #poll} method of this
 	 * object. If filtering is performed by this <code>Wire</code> object, this
 	 * methods returns the last value provided by the Producer service. This
 	 * value may be an <code>Envelope[]</code> when the Producer service uses

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdmin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdmin.java?view=diff&rev=465395&r1=465394&r2=465395
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdmin.java (original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/wireadmin/WireAdmin.java Wed Oct 18 15:02:38 2006
@@ -1,7 +1,7 @@
 /*
- * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/WireAdmin.java,v 1.8 2006/03/14 01:20:55 hargrave Exp $
+ * $Header: /cvshome/build/org.osgi.service.wireadmin/src/org/osgi/service/wireadmin/WireAdmin.java,v 1.11 2006/07/12 21:22:14 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,6 +18,7 @@
 package org.osgi.service.wireadmin;
 
 import java.util.Dictionary;
+
 import org.osgi.framework.InvalidSyntaxException;
 
 /**
@@ -37,7 +38,7 @@
  * <code>ServicePermission[WireAdmin,GET]</code> to get the Wire Admin service to
  * create, modify, find, and delete <code>Wire</code> objects.
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.11 $
  */
 public interface WireAdmin {
 	/**
@@ -51,7 +52,7 @@
 	 * The <code>Wire</code> configuration data must be persistently stored. All
 	 * <code>Wire</code> connections are reestablished when the <code>WireAdmin</code>
 	 * service is registered. A <code>Wire</code> can be permanently removed by
-	 * using the {@link #deleteWire}method.
+	 * using the {@link #deleteWire} method.
 	 * 
 	 * <p>
 	 * The <code>Wire</code> object's properties must have case insensitive
@@ -62,13 +63,13 @@
 	 * The <code>WireAdmin</code> service must automatically add the following
 	 * <code>Wire</code> properties:
 	 * <ul>
-	 * <li>{@link WireConstants#WIREADMIN_PID}set to the value of the
+	 * <li>{@link WireConstants#WIREADMIN_PID} set to the value of the
 	 * <code>Wire</code> object's persistent identity (PID). This value is
 	 * generated by the Wire Admin service when a <code>Wire</code> object is
 	 * created.</li>
-	 * <li>{@link WireConstants#WIREADMIN_PRODUCER_PID}set to the value of
+	 * <li>{@link WireConstants#WIREADMIN_PRODUCER_PID} set to the value of
 	 * Producer service's PID.</li>
-	 * <li>{@link WireConstants#WIREADMIN_CONSUMER_PID}set to the value of
+	 * <li>{@link WireConstants#WIREADMIN_CONSUMER_PID} set to the value of
 	 * Consumer service's PID.</li>
 	 * </ul>
 	 * If the <code>properties</code> argument already contains any of these keys,
@@ -77,7 +78,7 @@
 	 * 
 	 * <p>
 	 * The Wire Admin service must broadcast a <code>WireAdminEvent</code> of type
-	 * {@link WireAdminEvent#WIRE_CREATED}after the new <code>Wire</code> object
+	 * {@link WireAdminEvent#WIRE_CREATED} after the new <code>Wire</code> object
 	 * becomes available from {@link #getWires}.
 	 * 
 	 * @param producerPID The <code>service.pid</code> of the Producer service to
@@ -103,12 +104,12 @@
 	 * The <code>Wire</code> object representing a connection between a Producer
 	 * service and a Consumer service must be removed. The persistently stored
 	 * configuration data for the <code>Wire</code> object must destroyed. The
-	 * <code>Wire</code> object's method {@link Wire#isValid}will return
+	 * <code>Wire</code> object's method {@link Wire#isValid} will return
 	 * <code>false</code> after it is deleted.
 	 * 
 	 * <p>
 	 * The Wire Admin service must broadcast a <code>WireAdminEvent</code> of type
-	 * {@link WireAdminEvent#WIRE_DELETED}after the <code>Wire</code> object
+	 * {@link WireAdminEvent#WIRE_DELETED} after the <code>Wire</code> object
 	 * becomes invalid.
 	 * 
 	 * @param wire The <code>Wire</code> object which is to be deleted.
@@ -121,12 +122,12 @@
 	 * The persistently stored configuration data for the <code>Wire</code> object
 	 * is updated with the new properties and then the Consumer and Producer
 	 * services will be called at the respective
-	 * {@link Consumer#producersConnected}and
-	 * {@link Producer#consumersConnected}methods.
+	 * {@link Consumer#producersConnected} and
+	 * {@link Producer#consumersConnected} methods.
 	 * 
 	 * <p>
 	 * The Wire Admin service must broadcast a <code>WireAdminEvent</code> of type
-	 * {@link WireAdminEvent#WIRE_UPDATED}after the updated properties are
+	 * {@link WireAdminEvent#WIRE_UPDATED} after the updated properties are
 	 * available from the <code>Wire</code> object.
 	 * 
 	 * @param wire The <code>Wire</code> object which is to be updated.
@@ -153,7 +154,7 @@
 	 * <p>
 	 * The filter matches against the <code>Wire</code> object's properties
 	 * including {@link WireConstants#WIREADMIN_PRODUCER_PID},
-	 * {@link WireConstants#WIREADMIN_CONSUMER_PID}and
+	 * {@link WireConstants#WIREADMIN_CONSUMER_PID} and
 	 * {@link WireConstants#WIREADMIN_PID}.
 	 * 
 	 * @param filter Filter string to select <code>Wire</code> objects or



Mime
View raw message