geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r789407 [1/2] - in /geronimo/sandbox/blueprint: blueprint-api/src/main/java/org/osgi/service/blueprint/container/ blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ blueprint-core/src/main/resources/org/apache/geronimo/blueprin...
Date Mon, 29 Jun 2009 18:36:10 GMT
Author: gnodet
Date: Mon Jun 29 18:36:09 2009
New Revision: 789407

URL: http://svn.apache.org/viewvc?rev=789407&view=rev
Log:
Update to latest api / schema

Modified:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintEvent.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintListener.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ComponentDefinitionException.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/Converter.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/EventConstants.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/NoSuchComponentException.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ReifiedType.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ServiceUnavailableException.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanArgument.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanProperty.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ComponentMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/IdRefMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapEntry.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Metadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NonNullMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NullMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RegistrationListener.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Target.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ValueMetadata.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
    geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java Mon Jun 29 18:36:09 2009
@@ -44,7 +44,6 @@
  * @see org.osgi.framework.Constants
  */
 public interface BlueprintContainer {
-
 	/**
 	 * The set of component names recognized by the blueprint context.
 	 *
@@ -57,7 +56,7 @@
 	 * Get the component instance for a given named component. If the component
 	 * has not yet been instantiated, calling this operation will cause the
 	 * component instance to be created and initialized. If the component has a
-	 * prototype scope then each call to getComponent will return a new
+	 * prototype scope then each call to getComponentInstance will return a new
 	 * component instance. If the component has a bundle scope then the
 	 * component instance returned will be the instance for the caller's bundle
 	 * (and that instance will be instantiated if it has not already been
@@ -105,8 +104,8 @@
 	 * Returns all ComponentMetadata instances of the given type. The supported
 	 * Metadata types are ComponentMetadata (which returns the Metadata for all
 	 * defined component types), BeanMetadata, ServiceReferenceMetadata (which
-	 * returns both ReferenceMetadata and RefListMetadata instances),
-	 * ReferenceMetadata, RefListMetadata, and ServiceMetadata. The collection
+	 * returns both ReferenceMetadata and ReferenceListMetadata instances),
+	 * ReferenceMetadata, ReferenceListMetadata, and ServiceMetadata. The collection
 	 * will include all Metadata instances of the requested type, including
 	 * components that are declared as inline values.
 	 *
@@ -125,5 +124,4 @@
 	 * @return the blueprint context's bundle context
 	 */
 	BundleContext getBundleContext();
-
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintEvent.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintEvent.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintEvent.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintEvent.java Mon Jun 29 18:36:09 2009
@@ -19,24 +19,27 @@
 
 /**
  * A Blueprint Event.
- *
+ * 
  * <p>
- * <code>BlueprintEvent</code> objects are delivered to all registered <code>BlueprintListener</code>
- * service objects. BlueprintEvents must be asynchronously delivered in chronological order
- * with respect to each listener.
- *
+ * <code>BlueprintEvent</code> objects are delivered to all registered
+ * <code>BlueprintListener</code> service objects. Blueprint Events must be
+ * asynchronously delivered in chronological order with respect to each
+ * listener.
+ * 
  * <p>
- * In addition, when a listener is registered, the blueprint extender
- * will synchronously send to this listener the last event for each blueprint bundle managed
- * by this extender.  This replay of events is designed so that the new listener can
- * be informed of the state of each managed bundle.  Events sent during this replay will
- * have the {@link #replay} flag set. The blueprint extender must ensure that this replay phase
- * does not interfere with new events so that the chronological order of all events received
- * by the listener is preserved. If the last event for a given blueprint bundle is DESTROYED,
- * the extender must not send it during this replay phase.
- *
+ * In addition, when a listener is registered, the Blueprint extender will
+ * synchronously send to this listener the last event for each ready Blueprint bundle
+ * managed by this extender. This replay of events is designed so that the new
+ * listener can be informed of the state of each Blueprint bundle. Events sent
+ * during this replay will have the {@link #isReplay()} flag set. The Blueprint
+ * extender must ensure that this replay phase does not interfere with new
+ * events so that the chronological order of all events received by the listener
+ * is preserved. If the last event for a given Blueprint bundle is
+ * {@link #DESTROYED}, the extender must not send it during this replay phase.
+ * 
  * <p>
- * A type code is used to identify the type of event. The following event types are defined:
+ * A type code is used to identify the type of event. The following event types
+ * are defined:
  * <ul>
  * <li>{@link #CREATING}
  * <li>{@link #CREATED}
@@ -46,116 +49,185 @@
  * <li>{@link #GRACE_PERIOD}
  * <li>{@link #WAITING}
  * </ul>
- *
+ * 
  * <p>
- * <h2>Blueprint Events and EventAdmin</h2>
- * In addition to calling the registered {@link BlueprintListener}s, the blueprint extender
- * must also send those events to the EventAdmin service, if it is available. <br/>
- * See {@link EventConstants} for more informations.
- *
+ * <h2>Blueprint Events and Event Admin service</h2>
+ * In addition to calling the registered {@link BlueprintListener} services, the
+ * Blueprint extender must also send those events to the Event Admin service, if
+ * it is available. <br/> See {@link EventConstants} for more informations.
+ * 
  * @see BlueprintListener
  * @see EventConstants
+ *
+ * @Immutable
  */
 public class BlueprintEvent {
 
 	/**
-	 * The Blueprint extender has started creating a Blueprint Container for the bundle.
+	 * The Blueprint extender has started creating a Blueprint Container for the
+	 * bundle.
 	 */
 	public static final int CREATING = 1;
 	/**
-	 * The Blueprint extender has creating a Blueprint Container for the bundle.
-	 * This event is sent after the BlueprintContainer service has been registered.
+	 * The Blueprint extender has created a Blueprint Container for the bundle.
+	 * This event is sent after the Blueprint Container service has been
+	 * registered.
 	 */
 	public static final int CREATED = 2;
 	/**
-	 * The Blueprint extender has started detroying the Blueprint Container for the bundle.
+	 * The Blueprint extender has started destroying the Blueprint Container for
+	 * the bundle.
 	 */
 	public static final int DESTROYING = 3;
 	/**
 	 * The Blueprint Container for the bundle has been completely destroyed.
-	 * This event is sent after the BlueprintContainer service has been unregistered.
+	 * This event is sent after the Blueprint Container service has been
+	 * unregistered.
 	 */
 	public static final int DESTROYED = 4;
 	/**
-	 * The Blueprint Container creation for the bundle has failed.
-	 * If this event is sent after a timeout in the Grace Period, the {@link #getDependencies()}
-	 * method must return an array of missing mandatory dependencies.  The event must also contain
-	 * the cause of the failure as a <code>Throwable</code> through the {@link #getException()} method.
+	 * The Blueprint Container creation for the bundle has failed. If this event
+	 * is sent after a timeout in the Grace Period, the
+	 * {@link #getDependencies()} method must return an array of missing
+	 * mandatory dependencies. The event must also contain the cause of the
+	 * failure as a <code>Throwable</code> through the {@link #getException()}
+	 * method.
 	 */
 	public static final int FAILURE = 5;
 	/**
-	 * The Blueprint Container has entered the Grace Period.
-	 * The list of missing dependencies must be made available through the {@link #getDependencies()}
- 	 * method.  During the grace period, a GRACE_PERIOD event is sent each time the set of
-	 * unsatisfied dependencies changes.
+	 * The Blueprint Container has entered the grace period. The list of missing
+	 * dependencies must be made available through the
+	 * {@link #getDependencies()} method. During the grace period, a
+	 * {@link #GRACE_PERIOD} event is sent each time the set of unsatisfied
+	 * dependencies changes.
 	 */
 	public static final int GRACE_PERIOD = 6;
 	/**
-	 * The Blueprint Extender is waiting on the availability of a service to satisfy an
-	 * invocation on a referenced service.
-	 * The missing dependency must be made available through the {@link #getDependencies()}
-	 * method which will return an array containing one filter object as a String.
+	 * The Blueprint Extender is waiting on the availability of a service to
+	 * satisfy an invocation on a referenced service. The missing dependency
+	 * must be made available through the {@link #getDependencies()} method
+	 * which will return an array containing one filter object as a String.
 	 */
 	public static final int WAITING = 7;
 
-
 	/**
 	 * Type of this event.
-	 *
+	 * 
 	 * @see #getType()
 	 */
 	private final int type;
 	/**
-	 * The time when the event occured.
-	 *
+	 * The time when the event occurred.
+	 * 
 	 * @see #getTimestamp()
 	 */
 	private final long timestamp;
 	/**
-	 * The blueprint bundle.
-	 *
+	 * The Blueprint bundle.
+	 * 
 	 * @see #getBundle()
 	 */
 	private final Bundle bundle;
 	/**
- 	 * The blueprint extender bundle.
- 	 *
- 	 * @see #getExtenderBundle()
- 	 */
+	 * The Blueprint extender bundle.
+	 * 
+	 * @see #getExtenderBundle()
+	 */
 	private final Bundle extenderBundle;
 	/**
 	 * An array containing filters identifying the missing dependencies.
-	 *
+	 * 
 	 * @see #getDependencies()
 	 */
 	private final String[] dependencies;
 	/**
 	 * Cause of the failure.
-	 *
+	 * 
 	 * @see #getException()
 	 */
 	private final Throwable exception;
 	/**
- 	 * Indicate if this event is a replay event or not.
-	 *
+	 * Indicate if this event is a replay event or not.
+	 * 
 	 * @see #isReplay()
 	 */
 	private final boolean replay;
 
-
+	/**
+	 * Create a simple <code>BlueprintEvent</code> object.
+	 * 
+	 * @param type
+	 *            The type of the event.
+	 * @param bundle
+	 *            The Blueprint bundle this event is originating from.
+	 * @param extenderBundle
+	 *            The bundle of the Blueprint extender that is generating the
+	 *            event.
+	 */
 	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle) {
 		this(type, bundle, extenderBundle, null, null);
 	}
 
-	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle, String[] dependencies) {
+	/**
+	 * Create a <code>BlueprintEvent</code> object associated with a set of
+	 * dependencies.
+	 * 
+	 * @param type
+	 *            The type of the event.
+	 * @param bundle
+	 *            The Blueprint bundle this event is originating from.
+	 * @param extenderBundle
+	 *            The bundle of the Blueprint extender that is generating the
+	 *            event.
+	 * @param dependencies
+	 *            An array of <code>String</code> filters for each dependency
+	 *            associated with this event.
+	 */
+	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle,
+			String[] dependencies) {
 		this(type, bundle, extenderBundle, dependencies, null);
 	}
 
-	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle, Throwable exception) {
+	/**
+	 * Create a <code>BlueprintEvent</code> object associated with a failure
+	 * cause.
+	 * 
+	 * @param type
+	 *            The type of the event.
+	 * @param bundle
+	 *            The Blueprint bundle this event is originating from.
+	 * @param extenderBundle
+	 *            The bundle of the Blueprint extender that is generating the
+	 *            event.
+	 * @param exception
+	 *            A <code>Throwable</code> object describing the root cause of
+	 *            the event.
+	 */
+	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle,
+			Throwable exception) {
 		this(type, bundle, extenderBundle, null, exception);
 	}
 
-	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle, String[] dependencies, Throwable exception) {
+	/**
+	 * Create a <code>BlueprintEvent</code> object associated with a failure
+	 * cause and related to a set of dependencies.
+	 * 
+	 * @param type
+	 *            The type of the event.
+	 * @param bundle
+	 *            The Blueprint bundle this event is originating from.
+	 * @param extenderBundle
+	 *            The bundle of the Blueprint extender that is generating the
+	 *            event.
+	 * @param dependencies
+	 *            An array of <code>String</code> filters for each dependency
+	 *            associated with this event.
+	 * @param exception
+	 *            A <code>Throwable</code> object describing the root cause of
+	 *            the event.
+	 */
+	public BlueprintEvent(int type, Bundle bundle, Bundle extenderBundle,
+			String[] dependencies, Throwable exception) {
 		this.type = type;
 		this.timestamp = System.currentTimeMillis();
 		this.bundle = bundle;
@@ -166,12 +238,14 @@
 	}
 
 	/**
- 	 * Create a new blueprint event from the given blueprint event.
- 	 * The timestamp property will be copied from the original event and only the
- 	 * replay property will be overriden with the given value.
- 	 *
-	 * @param event the original event to copy
-	 * @param replay if the copied event should be used as a replay event
+	 * Create a new Blueprint Event from the given Blueprint event. The
+	 * <code>timestamp</code> property will be copied from the original event
+	 * and only the replay property will be overridden with the given value.
+	 * 
+	 * @param event
+	 *            the original event to copy
+	 * @param replay
+	 *            if the copied event should be used as a replay event
 	 */
 	public BlueprintEvent(BlueprintEvent event, boolean replay) {
 		this.type = event.type;
@@ -196,7 +270,7 @@
 	 * <li>{@link #GRACE_PERIOD}
 	 * <li>{@link #WAITING}
 	 * </ul>
-	 *
+	 * 
 	 * @return The type of this event.
 	 */
 	public int getType() {
@@ -205,7 +279,7 @@
 
 	/**
 	 * Return the time at which this event occured.
-	 *
+	 * 
 	 * @return The time at which this event occured.
 	 */
 	public long getTimestamp() {
@@ -213,48 +287,48 @@
 	}
 
 	/**
-	 * Return the blueprint bundle.
-	 *
-	 * @return The blueprint bundle.  Never <code>null</code>.
+	 * Return the Blueprint bundle.
+	 * 
+	 * @return The Blueprint bundle. Never <code>null</code>.
 	 */
 	public Bundle getBundle() {
 		return bundle;
 	}
 
 	/**
-	 * Return the Bundle of the blueprint extender.
-	 *
-	 * @return The Bundle of the blueprint extender.  Never <code>null</code>.
+	 * Return the Bundle of the Blueprint extender.
+	 * 
+	 * @return The Bundle of the Blueprint extender. Never <code>null</code>.
 	 */
 	public Bundle getExtenderBundle() {
 		return extenderBundle;
 	}
 
 	/**
-	 * Return the filters identifying the missing dependencies that caused this event.
+	 * Return the filters identifying the missing dependencies that caused this
+	 * event.
 	 * <p>
-	 * This field is only valid for {@link #WAITING},
-	 * {@link #GRACE_PERIOD} and {@link #FAILURE}
-	 * events.
-	 *
-	 * @return The missing dependencies informations.  May be <code>null</code>.
+	 * This field is only valid for {@link #WAITING}, {@link #GRACE_PERIOD} and
+	 * {@link #FAILURE} events.
+	 * 
+	 * @return The missing dependencies informations. May be <code>null</code>.
 	 */
 	public String[] getDependencies() {
-		return dependencies;
+		return dependencies != null ? (String[]) dependencies.clone() : null;
 	}
 
 	/**
 	 * Return the cause for a {@link #FAILURE} event.
-	 *
-	 * @return The cause of the failure.  May be <code>null</code>.
+	 * 
+	 * @return The cause of the failure. May be <code>null</code>.
 	 */
 	public Throwable getException() {
 		return exception;
 	}
 
 	/**
- 	 * Return the fact that this event is a replay event or not.
-	 *
+	 * Return the fact that this event is a replay event or not.
+	 * 
 	 * @return a boolean indicating if this event is a replay event.
 	 */
 	public boolean isReplay() {

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintListener.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintListener.java Mon Jun 29 18:36:09 2009
@@ -17,16 +17,17 @@
 
 /**
  * Listener for <code>BlueprintEvent</code>s.
- *
+ * 
  * @see BlueprintEvent
  */
 public interface BlueprintListener {
 
 	/**
- 	 * Receives notifications of a blueprint event.
- 	 *
- 	 * @param event The <code>BlueprintEvent</code>.
- 	 */
+	 * Receives notifications of a Blueprint Event.
+	 * 
+	 * @param event
+	 *            The <code>BlueprintEvent</code>.
+	 */
 	void blueprintEvent(BlueprintEvent event);
 
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ComponentDefinitionException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ComponentDefinitionException.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ComponentDefinitionException.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ComponentDefinitionException.java Mon Jun 29 18:36:09 2009
@@ -16,11 +16,11 @@
 package org.osgi.service.blueprint.container;
 
 /**
- * Exception thrown when a configuration-related error occurs during
- * creation of a module context.
+ * Exception thrown when a configuration-related error occurs during creation of
+ * a Blueprint Container.
  */
 public class ComponentDefinitionException extends RuntimeException {
-
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Creates a <code>ComponentDefinitionException</code> with no message or
@@ -30,34 +30,36 @@
 		super();
 	}
 
-
 	/**
-	 * Creates a <code>ComponentDefinitionException</code> with the specified message
-	 *
-	 * @param explanation The associated message.
+	 * Creates a <code>ComponentDefinitionException</code> with the specified
+	 * message
+	 * 
+	 * @param explanation
+	 *            The associated message.
 	 */
 	public ComponentDefinitionException(String explanation) {
 		super(explanation);
 	}
 
-
 	/**
-	 * Creates a <code>ComponentDefinitionException</code> with the specified message and
-	 * exception cause.
-	 *
-	 * @param explanation The associated message.
-	 * @param cause The cause of this exception.
+	 * Creates a <code>ComponentDefinitionException</code> with the specified
+	 * message and exception cause.
+	 * 
+	 * @param explanation
+	 *            The associated message.
+	 * @param cause
+	 *            The cause of this exception.
 	 */
 	public ComponentDefinitionException(String explanation, Throwable cause) {
 		super(explanation, cause);
 	}
 
-
 	/**
-	 * Creates a <code>ComponentDefinitionException</code> with the
-	 * exception cause.
-	 *
-	 * @param cause The cause of this exception.
+	 * Creates a <code>ComponentDefinitionException</code> with the exception
+	 * cause.
+	 * 
+	 * @param cause
+	 *            The cause of this exception.
 	 */
 	public ComponentDefinitionException(Throwable cause) {
 		super(cause);

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/Converter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/Converter.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/Converter.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/Converter.java Mon Jun 29 18:36:09 2009
@@ -24,12 +24,12 @@
 	/**
 	 * Check if the converter is able to convert the given value to the
 	 * specified type.
-	 *
+	 * 
 	 * @param s
 	 *            The source object to convert from
 	 * @param T
 	 *            The target type
-	 *
+	 * 
 	 * @return <code>true</code> if the conversion is possible,
 	 *         <code>false</code> otherwise.
 	 */
@@ -38,7 +38,7 @@
 	/**
 	 * Convert an object to an instance of the given class, using the built-in
 	 * and user-registered type converters as necessary.
-	 *
+	 * 
 	 * @param s
 	 *            The source object to convert from
 	 * @param T

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/EventConstants.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/EventConstants.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/EventConstants.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/EventConstants.java Mon Jun 29 18:36:09 2009
@@ -15,22 +15,24 @@
  */
 package org.osgi.service.blueprint.container;
 
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
+import org.osgi.framework.*;
 
 /**
- * Event property names used in EventAdmin events published for a
- * blueprint container.
- *
+ * Event property names used in Event Admin events published for a Blueprint
+ * container.
+ * 
  * Each type of event is sent to a different topic:<br/>
+ * 
  * <pre>
  *   org/osgi/service/blueprint/container/&lt;event-type&gt;
  * </pre>
- * where <code>&lt;event-type&gt;</code> can have the values <code>CREATING</code>, <code>CREATED</code>,
- * <code>DESTROYING</code>, <code>DESTROYED</code>, <code>FAILURE</code>, <code>GRACE_PERIOD</code> or
- * <code>WAITING</code>. <br/>
- * Such events have the following properties:<ul>
- *   <li><code>type<code>
+ * 
+ * where <code>&lt;event-type&gt;</code> can have the values
+ * <code>CREATING</code>, <code>CREATED</code>, <code>DESTROYING</code>,
+ * <code>DESTROYED</code>, <code>FAILURE</code>, <code>GRACE_PERIOD</code>
+ * or <code>WAITING</code>. <br/> Such events have the following properties:
+ * <ul>
+ * <li><code>type<code>
  *   <li><code>event<code>
  *   <li><code>timestamp<code>
  *   <li><code>bundle<code>
@@ -46,57 +48,58 @@
  * </ul>
  */
 public interface EventConstants {
-	
+
 	/**
-	 * The type of the event that has been issued.
-	 * This property is of type {@link java.lang.Integer} and can take one of the values defined in {@link BlueprintEvent}.
+	 * The type of the event that has been issued. This property is of type
+	 * <code>Integer</code> and can take one of the values defined in
+	 * {@link BlueprintEvent}.
 	 */
 	public static final String TYPE = "type";
-	
+
 	/**
- 	 * The <code>BlueprintEvent</code> that caused this event.
- 	 * This property is of type {@link BlueprintEvent}.
- 	 */
+	 * The <code>BlueprintEvent</code> object that caused this event. This
+	 * property is of type {@link BlueprintEvent}.
+	 */
 	public static final String EVENT = "event";
 
 	/**
- 	 * The type of the event that has been issued.
-	 * This property is of type {@link java.lang.Long}.
- 	 */
+	 * The type of the event that has been issued. This property is of type
+	 * <code>Long</code>.
+	 */
 	public static final String TIMESTAMP = "timestamp";
-	
+
 	/**
- 	 * The bundle property defining the blueprint bundle for which an event has been issued.
-	 * This property is of type {@link org.osgi.framework.Bundle}.
- 	 *
- 	 * @see Bundle
- 	 */
+	 * The bundle property defining the blueprint bundle for which an event has
+	 * been issued. This property is of type {@link org.osgi.framework.Bundle}.
+	 * 
+	 * @see Bundle
+	 */
 	public static final String BUNDLE = "bundle";
 
 	/**
- 	 * The bundle id property defining the id of the blueprint bundle for which an event has been issued.
-	 * This property is of type {@link java.lang.Integer}.
- 	 */
+	 * The bundle id property defining the id of the blueprint bundle for which
+	 * an event has been issued. This property is of type <code>Integer</code>.
+	 */
 	public static final String BUNDLE_ID = "bundle.id";
 
 	/**
- 	 * The bundle symbolic name property defining the symbolic name of
- 	 * the blueprint bundle for which an event has been issued.
-	 * This property is of type {@link java.lang.String}.
- 	 */
+	 * The bundle symbolic name property defining the symbolic name of the
+	 * blueprint bundle for which an event has been issued. This property is of
+	 * type <code>String</code>.
+	 */
 	public static final String BUNDLE_SYMBOLICNAME = "bundle.symbolicName";
 
 	/**
-  	 * The bundle id property defining the id of the blueprint bundle for which an event has been issued.
- 	 * This property is of type {@link java.lang.Integer}.
- 	 */
+	 * The bundle id property defining the id of the blueprint bundle for which
+	 * an event has been issued. This property is of type <code>Integer</code>.
+	 */
 	public static final String BUNDLE_VERSION = "bundle.version";
 
 	/**
 	 * The extender bundle property defining the extender bundle processing the
-	 * blueprint container for which an event has been issued.
-	 * This property is of type {@link org.osgi.framework.Bundle}.
-	 *
+	 * blueprint container for which an event has been issued. This property is
+	 * of type {@link org.osgi.framework.Bundle}.
+	 * 
 	 * @see Bundle
 	 */
 	public static final String EXTENDER_BUNDLE = "extender.bundle";
@@ -104,76 +107,82 @@
 	/**
 	 * The extender bundle id property defining the id of the extender bundle
 	 * processing the blueprint container for which an event has been issued.
-	 * This property is of type {@link java.lang.Integer}.
+	 * This property is of type <code>Integer</code>.
 	 */
 	public static final String EXTENDER_BUNDLE_ID = "extender.bundle.id";
 
 	/**
 	 * The extender bundle symbolic name property defining the symbolic name of
 	 * the extender bundle processing the blueprint container for which an event
-	 * has been issued.
-	 * This property is of type {@link java.lang.String}.
+	 * has been issued. This property is of type <code>String</code>.
 	 */
 	public static final String EXTENDER_BUNDLE_SYMBOLICNAME = "extender.bundle.symbolicName";
 
 	/**
-  	 * The extender bundle version property defining the version of the extender bundle
- 	 * processing the blueprint container for which an event has been issued.
- 	 * This property is of type {@link java.lang.Integer}.
- 	 */
+	 * The extender bundle version property defining the version of the extender
+	 * bundle processing the blueprint container for which an event has been
+	 * issued. This property is of type <code>Integer</code>.
+	 */
 	public static final String EXTENDER_BUNDLE_VERSION = "extender.bundle.version";
 
 	/**
- 	 * The dependencies property containing an array of filters describing the missing
- 	 * mandatory dependencies for a FAILED, GRACE_PERIOD or WAITING event.
-	 * This property is an array of {@link java.lang.String}.
- 	 */
+	 * The dependencies property containing an array of filters describing the
+	 * missing mandatory dependencies for a FAILED, GRACE_PERIOD or WAITING
+	 * event. This property is an array of <code>String</code>.
+	 */
 	public static final String DEPENDENCIES = "dependencies";
 
 	/**
- 	 * The exception property containing the cause for a FAILED event.
-	 * This property is of type {@link java.lang.Throwable}.
- 	 */
+	 * The exception property containing the cause for a FAILED event. This
+	 * property is of type <code>Throwable</code>.
+	 */
 	public static final String EXCEPTION = "exception";
 
 	/**
-	 * Topic prefix for all events issued by the Blueprint Service
+	 * Topic prefix for all events issued by the Blueprint Container
 	 */
 	public static final String TOPIC_BLUEPRINT_EVENTS = "org/osgi/service/blueprint";
 
 	/**
 	 * Topic for Blueprint Container CREATING events
 	 */
-	public static final String TOPIC_CREATING = TOPIC_BLUEPRINT_EVENTS + "/container/CREATING";
+	public static final String TOPIC_CREATING = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/CREATING";
 
 	/**
- 	 * Topic for Blueprint Container CREATED events
- 	 */
-	public static final String TOPIC_CREATED = TOPIC_BLUEPRINT_EVENTS + "/container/CREATED";
+	 * Topic for Blueprint Container CREATED events
+	 */
+	public static final String TOPIC_CREATED = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/CREATED";
 
 	/**
- 	 * Topic for Blueprint Container DESTROYING events
- 	 */
-	public static final String TOPIC_DESTROYING = TOPIC_BLUEPRINT_EVENTS + "/container/DESTROYING";
+	 * Topic for Blueprint Container DESTROYING events
+	 */
+	public static final String TOPIC_DESTROYING = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/DESTROYING";
 
 	/**
 	 * Topic for Blueprint Container DESTROYED events
 	 */
-	public static final String TOPIC_DESTROYED = TOPIC_BLUEPRINT_EVENTS + "/container/DESTROYED";
+	public static final String TOPIC_DESTROYED = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/DESTROYED";
 
 	/**
- 	 * Topic for Blueprint Container FAILURE events
- 	 */
-	public static final String TOPIC_FAILURE = TOPIC_BLUEPRINT_EVENTS + "/container/FAILURE";
+	 * Topic for Blueprint Container FAILURE events
+	 */
+	public static final String TOPIC_FAILURE = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/FAILURE";
 
 	/**
- 	 * Topic for Blueprint Container GRACE_PERIOD events
- 	 */
-	public static final String TOPIC_GRACE_PERIOD = TOPIC_BLUEPRINT_EVENTS + "/container/GRACE_PERIOD";
+	 * Topic for Blueprint Container GRACE_PERIOD events
+	 */
+	public static final String TOPIC_GRACE_PERIOD = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/GRACE_PERIOD";
 
 	/**
 	 * Topic for Blueprint Container WAITING events
 	 */
-	public static final String TOPIC_WAITING = TOPIC_BLUEPRINT_EVENTS + "/container/WAITING";
+	public static final String TOPIC_WAITING = TOPIC_BLUEPRINT_EVENTS
+			+ "/container/WAITING";
 
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/NoSuchComponentException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/NoSuchComponentException.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/NoSuchComponentException.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/NoSuchComponentException.java Mon Jun 29 18:36:09 2009
@@ -16,24 +16,45 @@
 package org.osgi.service.blueprint.container;
 
 /**
- * Thrown when an attempt is made to lookup a component by name and no such named
+ * Thrown when an attempt is made to lookup a component by id and no such
  * component exists in the blueprint container.
  */
 public class NoSuchComponentException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
 
+	/**
+	 * The name of the component request that generated the exception.
+	 */
 	private final String componentName;
 
+	/**
+	 * Create an exception for a single component name request.
+	 * 
+	 * @param componentName
+	 *            The name of the non-existent component.
+	 */
 	public NoSuchComponentException(String componentName) {
 		this.componentName = componentName;
 	}
 
+	/**
+	 * Returns the component name that generated the exception.
+	 * 
+	 * @return The String name of the component associated with an unresolved
+	 *         request.
+	 */
 	public String getComponentName() {
 		return this.componentName;
 	}
 
+	/**
+	 * Returns a human readable message associated with the exception.
+	 * 
+	 * @return The descriptive message for the exception.
+	 */
 	public String getMessage() {
-		return "No component named '" +
-		       (this.componentName == null ? "<null>" : this.componentName) +
-		       "' could be found";
+		return "No component named '"
+				+ (this.componentName == null ? "<null>" : this.componentName)
+				+ "' could be found";
 	}
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ReifiedType.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ReifiedType.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ReifiedType.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ReifiedType.java Mon Jun 29 18:36:09 2009
@@ -17,21 +17,20 @@
 
 /**
  * Provides access to a concrete type and its optional generic type argument.
- *
+ * 
  * A Collapsed Type converts a type declaration to a generalized form that is
  * directly usable for conversion.It provides access to the concrete Class of
  * the type as well of the optional type arguments.
- *
+ * 
  * In Java 1.4, this class only works on non-generic types. In those cases, a
  * Collapsed Type provides to the class and has no type arguments. Blueprint
  * extender implementations can subclass this class and provide access to the
  * generics type graph if used in a declaration. Such a subclass must
- * <em>collapse<em> the different <code>Type</code> instances into the
+ * <em>collapse<em> the different <code>Type</code> instances into the 
  * collapsed form. That is, a form where the raw Class is available with its optional type arguments.
  *
- *@Immutable
+ * @Immutable
  */
-
 public class ReifiedType {
 	final static ReifiedType ALL = new ReifiedType(Object.class);
 
@@ -40,7 +39,7 @@
 	/**
 	 * Create a Collapsed Type for a normal Java class without any generics
 	 * information.
-	 *
+	 * 
 	 * @param clazz
 	 *            The class that is the collapsed type.
 	 */
@@ -50,17 +49,17 @@
 
 	/**
 	 * Access to the raw class.
-	 *
+	 * 
 	 * The raw class represents the concrete class that is associated with a
 	 * type declaration. This class could have been deduced from the generics
 	 * type graph of the declaration. For example, in the following example:
-	 *
+	 * 
 	 * <pre>
 	 * Map&lt;String, Object&gt; map;
 	 * </pre>
-	 *
+	 * 
 	 * The raw class is the Map class.
-	 *
+	 * 
 	 * @return the collapsed raw class that represents this type.
 	 */
 	public Class getRawClass() {
@@ -69,25 +68,25 @@
 
 	/**
 	 * Access to a type argument.
-	 *
+	 * 
 	 * The type argument refers to a argument in a generic type declaration
 	 * given by index <code>i</code>. This method returns a Collapsed Type
 	 * that has Object as class when no generic type information is available.
 	 * Any object is assignable to Object and therefore no conversion is then
 	 * necessary, this is compatible with older Javas.
-	 *
+	 * 
 	 * This method should be overridden by a subclass that provides access to
 	 * the generic information.
-	 *
+	 * 
 	 * For example, in the following example:
-	 *
+	 * 
 	 * <pre>
 	 * Map&lt;String, Object&gt; map;
 	 * </pre>
-	 *
+	 * 
 	 * The type argument 0 is <code>String</code>, and type argument 1 is
 	 * <code>Object</code>.
-	 *
+	 * 
 	 * @param i
 	 *            The index of the type argument
 	 * @return A Collapsed Type that represents a type argument. If
@@ -95,12 +94,12 @@
 	public ReifiedType getActualTypeArgument(int i) {
 		return ALL;
 	}
-
+	
 	/**
 	 * Return the number of type arguments.
-	 *
+	 * 
 	 * This method should be overridden by a subclass for Java 5 types.
-	 *
+	 * 
 	 * @return 0, subclasses must override this
 	 */
 	public int size() {

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ServiceUnavailableException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ServiceUnavailableException.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ServiceUnavailableException.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/ServiceUnavailableException.java Mon Jun 29 18:36:09 2009
@@ -22,48 +22,50 @@
  * a backing service is not available.
  */
 public class ServiceUnavailableException extends ServiceException {
+	private static final long serialVersionUID = 1L;
 
+	/**
+	 * The filter string associated with the exception.
+	 */
 	private final String filter;
 
-
-    /**
-     * Creates a <code>ServiceUnavaiableException</code> with the specified message.
-     *
-     * @param message The associated message.
-     * @param filterExpression
-     *                The filter expression used for the service lookup.
-     */
-	public ServiceUnavailableException(
-           String message,
-           String filterExpression) {
+	/**
+	 * Creates a Service Unavailable Exception with the specified message.
+	 * 
+	 * @param message
+	 *            The associated message.
+	 * @param filter
+	 *            The filter used for the service lookup.
+	 */
+	public ServiceUnavailableException(String message, String filter) {
 		super(message, UNREGISTERED);
-		this.filter = filterExpression;
+		this.filter = filter;
 	}
 
-
 	/**
-	 * Creates a <code>ServiceUnavaiableException</code> with the specified message and
+	 * Creates a Service Unavailable Exception with the specified message and
 	 * exception cause.
-	 *
-	 * @param message The associated message.
-     * @param filterExpression
-     *                The filter expression used for the service lookup.
-	 * @param cause The cause of this exception.
+	 * 
+	 * @param message
+	 *            The associated message.
+	 * @param filter
+	 *            The filter used for the service lookup.
+	 * @param cause
+	 *            The cause of this exception.
 	 */
-	public ServiceUnavailableException(
-           String message,
-           String filterExpression,
-           Throwable cause) {
+	public ServiceUnavailableException(String message, String filter,
+			Throwable cause) {
 		super(message, UNREGISTERED, cause);
-		this.filter = filterExpression;
+		this.filter = filter;
 	}
 
 	/**
-	 * The filter expression that a service would have needed to satisfy in order
-	 * for the invocation to proceed.
+	 * Returns the filter expression that a service would have needed to satisfy
+	 * in order for the invocation to proceed.
+	 * 
+	 * @return The failing filter.
 	 */
 	public String getFilter() {
 		return this.filter;
 	}
 }
-

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanArgument.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanArgument.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanArgument.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanArgument.java Mon Jun 29 18:36:09 2009
@@ -46,13 +46,11 @@
 	 * The (zero-based) index into the parameter list of the method or
 	 * constructor to be invoked for this parameter. This is determined either
 	 * by explicitly specifying the index attribute in the component
-	 * declaration, or by declaration order of constructor-arg elements if the
-	 * index was not explicitly set.
+	 * declaration.  If not explicitly set, this will return -1.
 	 *
 	 * This is the <code>index</code> attribute.
 	 *
-	 *
-	 * @return the zero-based parameter index
+	 * @return the zero-based parameter index, or -1 if the argument position was not set.
 	 */
 	int getIndex();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanMetadata.java Mon Jun 29 18:36:09 2009
@@ -19,19 +19,28 @@
 
 /**
  * Metadata for a Bean Component.
- *
+ * 
  * This class describes a <code>bean</code> element.
  */
 public interface BeanMetadata extends Target, ComponentMetadata {
 
+	/**
+	 * Used when the <code>scope</code> is <code>singleton</code>. See
+	 * {@link #getScope()}
+	 */
+
 	static final String SCOPE_SINGLETON = "singleton";
+	/**
+	 * Used when the <code>scope</code> is <code>prototype</code> See
+	 * {@link #getScope()}
+	 */
 	static final String SCOPE_PROTOTYPE = "prototype";
 
 	/**
 	 * The name of the class type specified for this component.
-	 *
+	 * 
 	 * This is the <code>class</code> attribute.
-	 *
+	 * 
 	 * @return the name of the component class. If no class was specified in the
 	 *         component definition (because the a factory component is used
 	 *         instead) then this method will return null.
@@ -40,9 +49,9 @@
 
 	/**
 	 * The name of the init method specified for this component, if any.
-	 *
+	 * 
 	 * This is the <code>init-method</code> attribute.
-	 *
+	 * 
 	 * @return the method name of the specified init method, or null if no init
 	 *         method was specified.
 	 */
@@ -50,9 +59,9 @@
 
 	/**
 	 * The name of the destroy method specified for this component, if any.
-	 *
+	 * 
 	 * This is the <code>destroy-method</code> attribute.
-	 *
+	 * 
 	 * @return the method name of the specified destroy method, or null if no
 	 *         destroy method was specified.
 	 */
@@ -60,31 +69,32 @@
 
 	/**
 	 * The arguments for the factory method or constructor.
+	 * 
+	 * Specified in all the child
+	 * <code>argument<code> elements. The return is a list of {@link BeanArgument} objects.
 	 *
-	 * Specified in all the child <code>argument<code> elements.
-	 *
-	 * @return The metadata for the factory method or constructor. Can be empty if no arguments are specified
+	 * @return The Metadata for the factory method or constructor. Can be empty if no arguments are specified
 	 */
 	List<BeanArgument> getArguments();
 
 	/**
 	 * The property injection metadata for this component.
-	 *
+	 * 
 	 * Specified in all the child <code>property</code> elements.
-	 *
-	 * @return an immutable collection of BeanProperty, with one
-	 *         entry for each property to be injected. If no property injection
-	 *         was specified for this component then an empty collection will be
+	 * 
+	 * @return an immutable collection of {@link BeanProperty}, with one entry
+	 *         for each property to be injected. If no property injection was
+	 *         specified for this component then an empty collection will be
 	 *         returned.
-	 *
+	 * 
 	 */
 	List<BeanProperty> getProperties();
 
 	/**
 	 * Provides the name of the optional factory method.
-	 *
+	 * 
 	 * This is the <code>factory-method</code> attribute.
-	 *
+	 * 
 	 * @return The name of the factory method or <code>null</code>.
 	 */
 	String getFactoryMethod();
@@ -92,9 +102,9 @@
 	/**
 	 * The component instance on which to invoke the factory method (if
 	 * specified).
-	 *
+	 * 
 	 * The component is defined in the <code>factory-component</code>.
-	 *
+	 * 
 	 * @return when a factory method and factory component has been specified
 	 *         for this component, this operation returns the metadata
 	 *         specifying the component on which the factory method is to be
@@ -103,18 +113,17 @@
 	 *         non-null factory method indicates that the factory method should
 	 *         be invoked as a static method on the component class itself. For
 	 *         a non-null return value, the Metadata object returned will be a
-	 *         RefMetadata or a TargetComponentMetadata instance.
+	 *         {@link Target} instance.
 	 */
 	Target getFactoryComponent();
 
 	/**
 	 * The specified scope for the component lifecycle.
-	 *
+	 * 
 	 * @return a String indicating the scope specified for the component.
-	 *
+	 * 
 	 * @see #SCOPE_SINGLETON
 	 * @see #SCOPE_PROTOTYPE
 	 */
 	String getScope();
-
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanProperty.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanProperty.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanProperty.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/BeanProperty.java Mon Jun 29 18:36:09 2009
@@ -23,18 +23,18 @@
 
 	/**
 	 * The name of the property to be injected, following JavaBeans conventions.
-	 *
+	 * 
 	 * Defined in the <code>name</code> attribute.
-	 *
+	 * 
 	 * @return the property name.
 	 */
 	String getName();
 
 	/**
 	 * The metadata for the value to inject the property with.
-	 *
+	 * 
 	 * Defined in the <code>value</code> attribute or inlined component.
-	 *
+	 * 
 	 * @return the metadata for the property value.
 	 */
 	Metadata getValue();

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/CollectionMetadata.java Mon Jun 29 18:36:09 2009
@@ -18,33 +18,37 @@
 import java.util.List;
 
 /**
- * Metadata for a collection based value. Members of the array are instances of Metadata.
- * The Collection metadata can constrain (### convert) to a specific type.
+ * Metadata for a collection based value. Members of the collection are instances of
+ * Metadata. The Collection metadata can constrain to a specific type.
  */
 
 public interface CollectionMetadata extends NonNullMetadata {
 
 	/**
 	 * Provide the interface that this collection must implement.
-	 *
-	 * This is used for Arrays (Object[]), Set, and List. This information
-	 * is encoded in the element name.
-	 *
-	 *
+	 * 
+	 * This is used for Arrays (Object[]), Set, and List. This information is
+	 * encoded in the element name.
+	 * 
+	 * 
 	 * @return The interface class that the collection must implement.
 	 */
 	Class<?> getCollectionClass();
 
-    /**
-     * The value-type specified for the array
-     *
-     * The <code>value-type</code> attribute.
-     * ### Shouldnt this also support getRuntimeValueType()?
-     */
+	/**
+	 * The value-type specified for the array
+	 * 
+	 * The <code>value-type</code> attribute.
+	 * 
+	 * @return The value type for this metadata
+	 */
 	String getValueType();
 
-    /**
-     * The of Metadata objects that describe the value.
-     */
+	/**
+	 * The of Metadata objects that describe the value.
+	 * 
+	 * @return A list of {@link Metadata} objects for the values of a
+	 *         collection.
+	 */
 	List<Metadata> getValues();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ComponentMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ComponentMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ComponentMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ComponentMetadata.java Mon Jun 29 18:36:09 2009
@@ -27,43 +27,42 @@
 public interface ComponentMetadata extends NonNullMetadata {
 
 	/**
-	 * The component will be eagerly instanciated
+	 * The component will be eagerly activate
 	 */
 	static final int ACTIVATION_EAGER = 1;
 
 	/**
- 	 * The component will be lazily instanciated
+ 	 * The component will be lazily activated
  	 */
 	static final int ACTIVATION_LAZY = 2;
 
-    /**
+	/**
 	 * The id of the component.
 	 *
-	 * ### renamed to getId
-	 * @return component id. The component id can be <code>null</code> if this is an anonymously
-	 * defined inner component.
+	 * @return component id. The component id can be <code>null</code> if this
+	 *         is an anonymously defined inner component.
 	 */
 	String getId();
 
 	/**
- 	 * Is this component to be lazily instantiated?
+ 	 * How should this component be activated?
  	 *
- 	 * This is the <code>initialization</code> attribute or the
- 	 * <code>default-initialization</code> in the <code>blueprint</code> element
+ 	 * This is the <code>activation</code> attribute or the
+ 	 * <code>default-activation</code> in the <code>blueprint</code> element
  	 * if not set.
  	 *
- 	 * @return the initialization method
+ 	 * @return the activation method
  	 * @see #ACTIVATION_EAGER
  	 * @see #ACTIVATION_LAZY
  	 */
 	int getActivation();
 
-    /**
-     * The names of any components listed in a "depends-on" attribute for this
-     * component.
-     *
-     * @return an immutable List of component names for components that we have explicitly
-     * declared a dependency on, or an empty set if none.
-     */
-    List<String> getDependsOn();
+	/**
+	 * The names of any components listed in a "depends-on" attribute for this
+	 * component.
+	 *
+	 * @return an immutable List of component ids for components that we have
+	 *         explicitly declared a dependency on, or an empty set if none.
+	 */
+	List<String> getDependsOn();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/IdRefMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/IdRefMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/IdRefMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/IdRefMetadata.java Mon Jun 29 18:36:09 2009
@@ -16,15 +16,16 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * A value which represents the name of another component in the module context.
- * The name itself will be injected, not the component that the name refers to.
- *
+ * A value which represents the id of another component in the Blueprint Container.
+ * The id itself will be injected, not the component that the id refers to.
+ * 
  */
 public interface IdRefMetadata extends NonNullMetadata {
 	/**
-	 * The name of the referenced component.
-	 * Defined in the <code>component</code> attribute.
-	 *
+	 * The id of the referenced component. Defined in the
+	 * <code>component-id</code> attribute.
+	 * 
+	 * @return The referred component id.
 	 */
 	String getComponentId();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapEntry.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapEntry.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapEntry.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapEntry.java Mon Jun 29 18:36:09 2009
@@ -17,27 +17,27 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * Metadata for an entry. An entry is the member of a MapMetadata so that it
- * can be treated as a CollectionMetadata with entries.
- *
+ * Metadata for an entry. An entry is the member of a MapMetadata so that it can
+ * be treated as a CollectionMetadata with entries.
+ * 
  * Defined in the <code>entry</code> element.
- *
+ * 
  */
 public interface MapEntry {
 	/**
 	 * Keys must be non-null.
-	 *
+	 * 
 	 * Defined in the <code>key</code> attribute or element.
-	 *
+	 * 
 	 * @return the metadata for the key
 	 */
 	NonNullMetadata getKey();
 
 	/**
 	 * Return the metadata for the value.
-	 *
+	 * 
 	 * Defined in the <code>value</code> attribute or element<.
-	 *
+	 * 
 	 * @return the metadata for the value
 	 */
 

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/MapMetadata.java Mon Jun 29 18:36:09 2009
@@ -18,30 +18,36 @@
 import java.util.List;
 
 /**
- * A map-based value. This represented as a collection of entries (as it is done in the schema).
- *
+ * A map-based value. This represented as a collection of entries (as it is done
+ * in the schema).
+ * 
  * A map is defined in the <code>map</code> element.
- *
+ * 
  */
 public interface MapMetadata extends NonNullMetadata {
 	/**
 	 * The key-type specified for map keys, or null if none given
-	 *
+	 * 
 	 * Defined in the <code>key-type</code> attribute.
-	 * ### should we have getRuntimeKeyType?
+	 * 
+	 * @return The key type name
 	 */
 	String getKeyType();
 
-    /**
-     * The value-type specified for the array
-     *
-	 * ### should we have getRuntimeValueType?
-     * The <code>value-type</code> attribute.
-     */
+	/**
+	 * The value-type specified for the array
+	 * 
+	 * The <code>value-type</code> attribute.
+	 * 
+	 * @return The value type name
+	 */
 	String getValueType();
 
-    /**
-     * The of Metadata objects that describe the value.
-     */
+	/**
+	 * The of Metadata objects that describe the value.
+	 * 
+	 * @return A list of {@link MapEntry} objects describing the
+	 *         <code>Map<code> contents.
+	 */
 	List<MapEntry> getEntries();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Metadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Metadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Metadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Metadata.java Mon Jun 29 18:36:09 2009
@@ -16,8 +16,8 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * Top level metadata. This represents any possible value.
- *
+ * Top level Metadata. This represents any possible value.
+ * 
  */
 public interface Metadata {
 

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NonNullMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NonNullMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NonNullMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NonNullMetadata.java Mon Jun 29 18:36:09 2009
@@ -16,9 +16,9 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * Base interfaces for metadata that cannot be null. The NullMetadata is the
- * only element not implementing this. Mainly used for keys in maps because they
- * cannot be null.
+ * Base interfaces for Metadata that cannot be null. The {@link NullMetadata} is
+ * the only element not implementing this. Mainly used for keys in maps because
+ * they cannot be <code>null</code>.
  */
 public interface NonNullMetadata extends Metadata {
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NullMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NullMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NullMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/NullMetadata.java Mon Jun 29 18:36:09 2009
@@ -20,5 +20,9 @@
  */
 public interface NullMetadata extends Metadata {
 
-	static final NullMetadata NULL = new NullMetadata() {};
+	/**
+	 * Singleton instance of the <code>NULL</code> Metadata.
+	 */
+	static final NullMetadata NULL = new NullMetadata() {
+	};
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/PropsMetadata.java Mon Jun 29 18:36:09 2009
@@ -18,24 +18,19 @@
 import java.util.List;
 
 /**
- * A java.util.Properties based value. The properties are defined as string to
- * string. This means that the actual value can be returned.
- *
- * ### I do not like it that you loose the original order. And potential errors
- * (like duplicate keys). I think this one should just go away. The
- * CollectionMetadata has a collection type so the instantiation can ensure
- *
+ * A <code>java.util.Properties</code> based value. The properties are
+ * defined as string to string. This means that the actual value can be
+ * returned.
+ * 
  * Defined in the <code>props</code> element.
- *
+ * 
  */
 public interface PropsMetadata extends NonNullMetadata {
 
 	/**
-	 * This is the same as getValuesMetadata but more type safe.
-	 *
-	 * Defined in <code>prop</code> sub elements.
-	 *
-	 * @return
+	 * Defined in <code>prop</code> elements for an Object Value.
+	 * 
+	 * @return list of <code>MapEntry</code> objects, never <code>null</code>
 	 */
 	List<MapEntry> getEntries();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefMetadata.java Mon Jun 29 18:36:09 2009
@@ -16,13 +16,15 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * A value which refers to another component in the module context by name.
+ * A value which refers by its id to another component in the Blueprint Container.
  */
 public interface RefMetadata extends Target, NonNullMetadata {
 	/**
-	 * The name of the referenced component.
-	 * Defined in the <code>component</code> attribute.
-	 *
+	 * The id of the referenced component. Defined in the
+	 * <code>component-id</code> attribute.
+	 * 
+	 * @return The component id
+	 * 
 	 */
 	String getComponentId();
 }

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListMetadata.java Mon Jun 29 18:36:09 2009
@@ -17,8 +17,7 @@
 
 /**
  * Service reference that binds to a collection of matching services from the
- * OSGi service registry. This is the <code>ref-list</code> or
- * <code>ref-set</code> element.
+ * OSGi service registry. This is the <code>reference-list</code> element.
  *
  */
 public interface ReferenceListMetadata extends ServiceReferenceMetadata {

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java Mon Jun 29 18:36:09 2009
@@ -16,35 +16,35 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * Metadata for a listener interested in service bind and unbind events for a service
- * reference.
+ * Metadata for a listener interested in service bind and unbind events for a
+ * service reference.
  */
 public interface ReferenceListener {
 
 	/**
-	 * The component instance that will receive bind and unbind
-	 * events. The returned value must reference a TargetListenerComponent
-	 * either directly or indirectly.  The return type will be either
-     * a RefMetadata instance or an TargetListenerComponent instance.
-	 *
+	 * The component instance that will receive bind and unbind events. The
+	 * returned value must reference a TargetListenerComponent either directly
+	 * or indirectly. The return type will be either a RefMetadata instance or
+	 * an TargetListenerComponent instance.
+	 * 
 	 * Defined in the <code>ref</code> attribute or inlined component.
-	 *
+	 * 
 	 * @return the listener component reference.
 	 */
 	Target getListenerComponent();
 
 	/**
-	 * The name of the method to invoke on the listener component when
-	 * a matching service is bound to the reference
-	 *
+	 * The name of the method to invoke on the listener component when a
+	 * matching service is bound to the reference
+	 * 
 	 * @return the bind callback method name.
 	 */
 	String getBindMethod();
 
 	/**
-	 * The name of the method to invoke on the listener component when
-	 * a service is unbound from the reference.
-	 *
+	 * The name of the method to invoke on the listener component when a service
+	 * is unbound from the reference.
+	 * 
 	 * @return the unbind callback method name.
 	 */
 	String getUnbindMethod();

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceMetadata.java Mon Jun 29 18:36:09 2009
@@ -16,20 +16,19 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- *
+ * 
  * Service reference that will bind to a single matching service in the service
  * registry.
- *
+ * 
  * Defines the <code>reference</code> element.
- *
+ * 
  */
 public interface ReferenceMetadata extends ServiceReferenceMetadata, Target {
 
 	/**
 	 * Timeout for service invocations when a matching backing service is
-	 * unavailable.
-	 * Defined in the <code>timeout</code> attribute.
-	 *
+	 * unavailable. Defined in the <code>timeout</code> attribute.
+	 * 
 	 * @return service invocation timeout in milliseconds
 	 */
 	long getTimeout();

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RegistrationListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RegistrationListener.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RegistrationListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RegistrationListener.java Mon Jun 29 18:36:09 2009
@@ -23,32 +23,32 @@
 
 	/**
 	 * The component instance that will receive registration and unregistration
-	 * events. The returned value must reference a TargetListenerComponent
-	 * either directly or indirectly.  The return type will be either
-     * a RefMetadata instance or an TargetListenerComponent instance.
-	 *
-	 * Defined in the <code>listener</code> child element.
-	 *
-	 * @return the listener component reference.
+	 * events. The returned value must reference a {@link Target} either
+	 * directly or indirectly. The return type will be either a
+	 * {@link RefMetadata} instance or an {@link Target} instance.
+	 * 
+	 * Defined in the <code>registration-listener</code> child element.
+	 * 
+	 * @return the registration listener component reference.
 	 */
 	Target getListenerComponent();
 
 	/**
-	 * The name of the method to invoke on the listener component when
-	 * the exported service is registered with the service registry.
-	 *
+	 * The name of the method to invoke on the listener component when the
+	 * exported service is registered with the service registry.
+	 * 
 	 * Defined in the <code>registration-method</code> attribute.
-	 *
+	 * 
 	 * @return the registration callback method name.
 	 */
 	String getRegistrationMethod();
 
 	/**
-	 * The name of the method to invoke on the listener component when
-	 * the exported service is unregistered from the service registry.
-	 *
+	 * The name of the method to invoke on the listener component when the
+	 * exported service is unregistered from the service registry.
+	 * 
 	 * Defined in the <code>unregistration-method</code> attribute.
-	 *
+	 * 
 	 * @return the unregistration callback method name.
 	 */
 	String getUnregistrationMethod();

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceMetadata.java Mon Jun 29 18:36:09 2009
@@ -18,90 +18,104 @@
 import java.util.Collection;
 import java.util.List;
 
-
 /**
- * Metadata representing a service to be exported by a module context.
- *
+ * Metadata representing a service to be exported by a Blueprint Container.
+ * 
  */
-public interface ServiceMetadata extends ComponentMetadata, Target {
+public interface ServiceMetadata extends ComponentMetadata {
 
 	/**
-	 * Do not auto-detect types for advertised service intefaces
+	 * Do not auto-detect types for advertised service interfaces
+	 * 
+	 * @see #getAutoExport()
 	 */
 	public static final int AUTO_EXPORT_DISABLED = 1;
 
 	/**
 	 * Advertise all Java interfaces implemented by the exported component as
 	 * service interfaces.
+	 * 
+	 * @see #getAutoExport()
 	 */
-	public static final int AUTO_EXPORT_INTERFACES= 2;
+	public static final int AUTO_EXPORT_INTERFACES = 2;
 
 	/**
-	 * Advertise all Java classes in the hierarchy of the exported component's type
-	 * as service interfaces.
+	 * Advertise all Java classes in the hierarchy of the exported component's
+	 * type as service interfaces.
+	 * 
+	 * @see #getAutoExport()
 	 */
 	public static final int AUTO_EXPORT_CLASS_HIERARCHY = 3;
 
 	/**
-	 * Advertise all Java classes and interfaces in the exported component's type as
-	 * service interfaces.
+	 * Advertise all Java classes and interfaces in the exported component's
+	 * type as service interfaces.
+	 * 
+	 * @see #getAutoExport()
 	 */
 	public static final int AUTO_EXPORT_ALL_CLASSES = 4;
 
 	/**
-	 * The component that is to be exported as a service. Value must refer to a component and
-	 * therefore be either a RefMetadata, BeanMetadata, or ReferenceMetadata.
-	 *
+	 * The component that is to be exported as a service. Value must refer to a
+	 * component and therefore be either a {@link RefMetadata},
+	 * {@link BeanMetadata}, or {@link ReferenceMetadata}.
+	 * 
 	 * Defined in the <code>registration-method</code> attribute.
-	 *
+	 * 
 	 * @return the component to be exported as a service.
 	 */
 	Target getServiceComponent();
 
 	/**
-	 * The type names of the set of interface types that the service should be advertised
-	 * as supporting, as specified in the component declaration.
-	 *
-	 * Defined in the <code>interface</code> attribute or <code>interfaces</code> element.
-	 *
-	 * @return an immutable set of (String) type names, or an empty set if using auto-export
+	 * The type names of the set of interface types that the service should be
+	 * advertised as supporting, as specified in the component declaration.
+	 * 
+	 * Defined in the <code>interface</code> attribute or
+	 * <code>interfaces</code> element.
+	 * 
+	 * @return an immutable set of (<code>String</code>) type names, or an
+	 *         empty set if using auto-export
 	 */
-	List/*<String>*/ getInterfaces();
+	List<String> getInterfaces();
 
 	/**
 	 * Return the auto-export mode specified.
-	 *
+	 * 
 	 * Defined in the <code>auto-export</code> attribute.
-	 *
-	 * @return One of AUTO_EXPORT_DISABLED, AUTO_EXPORT_INTERFACES, AUTO_EXPORT_CLASS_HIERARCHY, AUTO_EXPORT_ALL_CLASSES
+	 * 
+	 * @return One of {@link #AUTO_EXPORT_DISABLED},
+	 *         {@link #AUTO_EXPORT_INTERFACES},
+	 *         {@link #AUTO_EXPORT_CLASS_HIERARCHY},
+	 *         {@link #AUTO_EXPORT_ALL_CLASSES}
 	 */
 	int getAutoExport();
 
 	/**
 	 * The user declared properties to be advertised with the service.
-	 *
+	 * 
 	 * Defined in the <code>service-properties</code> element.
-	 *
-	 * @return Map containing the set of user declared service properties (may be
-	 * empty if no properties were specified).
+	 * 
+	 * @return <code>Map</code> containing the set of user declared service
+	 *         properties (may be empty if no properties were specified).
 	 */
 	List<MapEntry> getServiceProperties();
 
 	/**
-	 * The ranking value to use when advertising the service
-	 *
+	 * The ranking value to use when advertising the service. If this value is
+	 * zero, no ranking service property must be registered.
+	 * 
 	 * Defined in the <code>ranking</code> attribute.
-	 *
+	 * 
 	 * @return service ranking
 	 */
 	int getRanking();
 
 	/**
-	 * The listeners that have registered to be notified when the exported service
-	 * is registered and unregistered with the framework.
-	 *
+	 * The listeners that have registered to be notified when the exported
+	 * service is registered and unregistered with the framework.
+	 * 
 	 * Defined in the <code>registration-listener</code> elements.
-	 *
+	 * 
 	 * @return an immutable collection of RegistrationListenerMetadata
 	 */
 	Collection<RegistrationListener> getRegistrationListeners();

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java Mon Jun 29 18:36:09 2009
@@ -15,61 +15,67 @@
  */
 package org.osgi.service.blueprint.reflect;
 
-import java.util.Collection;
-
+import java.util.*;
 
 /**
- * Metadata describing a reference to a service that is to be imported into the module
- * context from the OSGi service registry.
- *
+ * Metadata describing a reference to a service that is to be imported into the
+ * module context from the OSGi service registry.
+ * 
  */
 public interface ServiceReferenceMetadata extends ComponentMetadata {
 
 	/**
 	 * A matching service is required at all times.
+	 * 
+	 * @see #getAvailability()
 	 */
 	public static final int AVAILABILITY_MANDATORY = 1;
 
 	/**
 	 * A matching service is not required to be present.
+	 * 
+	 * @see #getAvailability()
 	 */
 	public static final int AVAILABILITY_OPTIONAL = 2;
 
 	/**
 	 * Whether or not a matching service is required at all times.
-	 *
+	 * 
 	 * Defined in the <code>availibility</code> attribute.
-	 *
-	 * @return one of AVAILABILITY_MANDATORY or AVAILABILITY_OPTIONAL
+	 * 
+	 * @return one of {@link #AVAILABILITY_MANDATORY} or
+	 *         {@link #AVAILABILITY_OPTIONAL}
 	 */
 	int getAvailability();
 
 	/**
 	 * The interface type that the matching service must support
-	 *
+	 * 
 	 * Defined in the <code>interface</code> attribute.
-	 *
+	 * 
 	 * @return the String name of the requested service interface
 	 */
 	String getInterface();
 
 	/**
-	 * The value of the component-name attribute, if specified. This specifies
-	 * the name of a component that is registered in the service registry. This will
-	 * create an automatic filter (appended wit the filter if set) to select this
-	 * component based on its automatic ###name attribute.
-	 *
+	 * The value of the <code>component-name</code> attribute, if specified.
+	 * This specifies the name of a component that is registered in the service
+	 * registry. This will create an automatic filter (appended with the filter
+	 * if set) to select this component based on its automatic <code>id</code>
+	 * attribute.
+	 * 
 	 * Defined in the <code>component-name</code> attribute.
-	 *
-	 * @return the component name attribute value, or null if the attribute was not specified
+	 * 
+	 * @return the <code>component-name</code> attribute value, or
+	 *         <code>null</code> if the attribute was not specified
 	 */
 	String getComponentName();
 
 	/**
 	 * The filter expression that a matching service must pass
-	 *
+	 * 
 	 * Defined in the <code>filter</code> attribute.
-	 *
+	 * 
 	 * @return filter expression
 	 */
 	String getFilter();
@@ -77,10 +83,10 @@
 	/**
 	 * The set of listeners registered to receive bind and unbind events for
 	 * backing services.
-	 *
+	 * 
 	 * Defined in the <code>listener</code> elements.
-	 *
-	 * @return an immutable collection of registered ListenerMetadata
+	 * 
+	 * @return an immutable collection of {@link ReferenceListener} objects
 	 */
 	Collection<ReferenceListener> getReferenceListeners();
 

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Target.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Target.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Target.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Target.java Mon Jun 29 18:36:09 2009
@@ -15,11 +15,14 @@
  */
 package org.osgi.service.blueprint.reflect;
 
-
 /**
- * Provides a common interface for components that can be used as a direct target
- * for method calls. These are bean, reference, and ref.
- *
+ * Provides a common interface for components that can be used as a direct
+ * target for method calls. These are <code>bean</code>,
+ * <code>reference</code>, and <code>ref</code>.
+ * 
+ * @see BeanMetadata
+ * @see ReferenceMetadata
+ * @see RefMetadata
  */
 public interface Target extends Metadata {
 

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ValueMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ValueMetadata.java?rev=789407&r1=789406&r2=789407&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ValueMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ValueMetadata.java Mon Jun 29 18:36:09 2009
@@ -16,24 +16,27 @@
 package org.osgi.service.blueprint.reflect;
 
 /**
- * A simple string value that will be type-converted if necessary before
- * injecting into a target.
- *
+ * A simple <code>String</code> value that will be type-converted if necessary
+ * before injecting into a target.
+ * 
  * This class is representing the <code>value</code> element.
- *
+ * 
  */
 public interface ValueMetadata extends NonNullMetadata {
 	/**
 	 * The string value (unconverted) of this value).
-	 *
+	 * 
 	 * Defined in the <code>value</code> attribute or text part.
+	 * 
+	 * @return The content of the <code>value</code>
 	 */
 	String getStringValue();
 
 	/**
 	 * The name of the type to which this value should be coerced. May be null.
-	 *
 	 * Defined in the <code>type</code> attribute.
+	 * 
+	 * @return Optional type name for this value
 	 */
 	String getType();
 }



Mime
View raw message