You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/07/06 21:50:27 UTC
svn commit: r791585 [2/3] - 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-bundle/ blueprint-cm/src/main/resources/org/apache/g...
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=791585&r1=791584&r2=791585&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 Jul 6 19:50:26 2009
@@ -15,11 +15,13 @@
*/
package org.osgi.service.blueprint.reflect;
-import java.util.*;
+import java.util.Collection;
/**
- * Metadata describing a reference to am OSGi service.
+ * Metadata describing a reference to an OSGi service.
*
+ * @ThreadSafe
+ * @version $Revision$
*/
public interface ServiceReferenceMetadata extends ComponentMetadata {
@@ -28,19 +30,19 @@
*
* @see #getAvailability()
*/
- public static final int AVAILABILITY_MANDATORY = 1;
+ 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;
+ 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.
+ * Defined in the <code>availability</code> attribute.
*
* @return one of {@link #AVAILABILITY_MANDATORY} or
* {@link #AVAILABILITY_OPTIONAL}
@@ -52,7 +54,8 @@
*
* Defined in the <code>interface</code> attribute.
*
- * @return the name of the requested service interface or <code>null</code> when no interface name is defined.
+ * @return the name of the requested service interface or <code>null</code>
+ * when no interface name is defined.
*/
String getInterface();
@@ -80,7 +83,8 @@
String getFilter();
/**
- * The set of registration listeners defined to receive bind and unbind events.
+ * The set of registration listeners defined to receive bind and unbind
+ * events.
*
* Defined in the <code>registration-listener</code> element.
*
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=791585&r1=791584&r2=791585&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 Jul 6 19:50:26 2009
@@ -17,13 +17,15 @@
/**
* Provides a common interface for managers that can be used as a direct target
- * for method calls. These are <code>bean</code>, <code>reference</code>,
- * and <code>ref</code>.
+ * for method calls. These are <code>bean</code>, <code>reference</code>, and
+ * <code>ref</code>, where the <code>ref</code> must refer to a bean or reference manager.
*
* @see BeanMetadata
* @see ReferenceMetadata
* @see RefMetadata
+ * @ThreadSafe
+ * @version $Revision$
*/
public interface Target extends Metadata {
-
+ // marker interface
}
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=791585&r1=791584&r2=791585&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 Jul 6 19:50:26 2009
@@ -21,20 +21,23 @@
*
* This class is representing the <code>value</code> element.
*
+ * @ThreadSafe
+ * @version $Revision$
*/
public interface ValueMetadata extends NonNullMetadata {
/**
* The string value (unconverted) of this value.
*
- * Defined in the <code>value</code> attribute or text part of the <code>value</code> element.
+ * Defined in the <code>value</code> attribute or text part of the
+ * <code>value</code> element.
*
* @return The content of the <code>value</code>
*/
String getStringValue();
/**
- * The name of the type to which this value should be converted. May be <code>null</code>.
- * Defined in the <code>type</code> attribute.
+ * The name of the type to which this value should be converted. May be
+ * <code>null</code>. Defined in the <code>type</code> attribute.
*
* @return Optional class name for this value
*/
Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/package.html
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/package.html?rev=791585&r1=791584&r2=791585&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/package.html (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/package.html Mon Jul 6 19:50:26 2009
@@ -1,4 +1,5 @@
-<!-- $Revision: 5654 $ -->
+<!-- $Revision$ -->
+<BODY>
<p>Blueprint Reflection Package Version 1.0.
<p>Bundles wishing to use this package must list the package
in the Import-Package header of the bundle's manifest.
@@ -6,7 +7,8 @@
<pre>
Import-Package: org.osgi.service.blueprint.reflect; version="[1.0,2.0)"
</pre>
-<p> This package provides a reflection-based view of the configuration information for a given
+<p> This package provides a reflection-based view of the configuration information for a
Blueprint Container.
</p>
+</BODY>
Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/packageinfo
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/packageinfo?rev=791585&r1=791584&r2=791585&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/packageinfo (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/packageinfo Mon Jul 6 19:50:26 2009
@@ -1 +1 @@
-version 1.0
+version 1.0
Modified: geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-bundle/pom.xml?rev=791585&r1=791584&r2=791585&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-bundle/pom.xml Mon Jul 6 19:50:26 2009
@@ -35,6 +35,11 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>blueprint-cm</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd?rev=791585&r1=791584&r2=791585&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/resources/org/apache/geronimo/blueprint/compendium/cm/blueprint-cm.xsd Mon Jul 6 19:50:26 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
/*
- * $Revision: 6879 $
+ * $Revision$
*
* Copyright (c) OSGi Alliance (2008, 2009). All Rights Reserved.
*
@@ -86,7 +86,7 @@
<xsd:complexContent>
<xsd:extension base="bp:Tcomponent">
<xsd:sequence>
- <xsd:group ref="bp:baseServiceElements"/>
+ <xsd:group ref="bp:GbaseServiceElements"/>
<xsd:element name="managed-component" type="TmanagedComponent" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="interface" type="bp:Tclass" use="optional" />
@@ -100,7 +100,7 @@
</xsd:complexType>
<xsd:complexType name="TmanagedComponent">
- <xsd:group ref="bp:beanElements"/>
+ <xsd:group ref="bp:GbeanElements"/>
<xsd:attribute name="class" type="bp:Tclass"/>
<xsd:attribute name="init-method" type="bp:Tmethod"/>
<xsd:attribute name="destroy-method" type="bp:Tmethod"/>
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintEventDispatcher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintEventDispatcher.java?rev=791585&r1=791584&r2=791585&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintEventDispatcher.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintEventDispatcher.java Mon Jul 6 19:50:26 2009
@@ -47,7 +47,7 @@
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
* @version $Rev: 760378 $, $Date: 2009-03-31 11:31:38 +0200 (Tue, 31 Mar 2009) $
*/
-public class BlueprintEventDispatcher implements BlueprintListener, EventConstants {
+public class BlueprintEventDispatcher implements BlueprintListener {
private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintEventDispatcher.class);
@@ -110,7 +110,7 @@
private String toString(BlueprintEvent event) {
return "BlueprintEvent[type=" + getEventType(event.getType())
+ (event.getDependencies() != null ? ", dependencies=" + Arrays.asList(event.getDependencies()) : "")
- + (event.getException() != null ? ", exception=" + event.getException().getMessage() : "")
+ + (event.getCause() != null ? ", exception=" + event.getCause().getMessage() : "")
+ "]";
}
@@ -189,8 +189,8 @@
props.put(EventConstants.EXTENDER_BUNDLE_VERSION, version);
}
- if (event.getException() != null) {
- props.put(EventConstants.EXCEPTION, event.getException());
+ if (event.getCause() != null) {
+ props.put(EventConstants.CAUSE, event.getCause());
}
if (event.getDependencies() != null) {
props.put(EventConstants.DEPENDENCIES, event.getDependencies());