geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r785323 [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-cm/src/main/java/org/apache/geronimo/blueprint/compe...
Date Tue, 16 Jun 2009 17:52:29 GMT
Author: gnodet
Date: Tue Jun 16 17:52:28 2009
New Revision: 785323

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

Added:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java   (contents, props changed)
      - copied, changed from r784735, geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Listener.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableReferenceListener.java
      - copied, changed from r784675, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableListener.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListenerImpl.java
      - copied, changed from r784675, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListenerImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/utils/TypeUtilsTest.java
Removed:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Listener.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableListener.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListenerImpl.java
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/reflect/BeanMetadata.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-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintEventDispatcher.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintExtender.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ArrayRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/AbstractPropertyPlaceholder.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/ExtNamespaceHandler.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableBeanMetadata.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableRegistrationListener.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceMetadata.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceReferenceMetadata.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefListMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ConversionUtils.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/TypeUtils.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java
    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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -44,6 +44,16 @@
  */
 public interface BlueprintContainer {
 
+    /**
+     * The container will apply strict compliance rules
+     */
+    static final int COMPLIANCE_STRICT = 1;
+
+    /**
+      * The container will use loose compliance rules
+      */
+    static final int COMPLIANCE_LOOSE = 2;
+
 	/**
 	 * The set of component names recognized by the blueprint context.
 	 *
@@ -114,4 +124,17 @@
 	 * @return the blueprint context's bundle context
 	 */
 	BundleContext getBundleContext();
+
+    /**
+     * Returns the compliance rule in effect for the target
+     * BlueprintContainer.  COMPLIANCE_LOOSE is returned if
+     * any configuration file for the container specifies
+     * loose compliance.
+     *
+     * @return The value COMPLIANCE_STRICT if strict compliance (the
+     *         default) is used for all configuration files, or the
+     *         value COMPLIANCE_LOOSE if loose complance is specified
+     *         in any of the configuration files.
+     */
+    int getCompliance();
 }

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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -46,7 +46,7 @@
 	 * @return the method name of the specified init method, or null if no init
 	 *         method was specified.
 	 */
-	String getInitMethodName();
+	String getInitMethod();
 
 	/**
 	 * The name of the destroy method specified for this component, if any.
@@ -56,7 +56,7 @@
 	 * @return the method name of the specified destroy method, or null if no
 	 *         destroy method was specified.
 	 */
-	String getDestroyMethodName();
+	String getDestroyMethod();
 
 	/**
 	 * The arguments for the factory method or constructor.
@@ -87,7 +87,7 @@
 	 *
 	 * @return The name of the factory method or <code>null</code>.
 	 */
-	String getFactoryMethodName();
+	String getFactoryMethod();
 
 	/**
 	 * The component instance on which to invoke the factory method (if

Copied: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java (from r784735, geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Listener.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java?p2=geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java&p1=geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Listener.java&r1=784735&r2=785323&rev=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/Listener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java Tue Jun 16 17:52:28 2009
@@ -19,7 +19,7 @@
  * Metadata for a listener interested in service bind and unbind events for a service
  * reference.
  */
-public interface Listener {
+public interface ReferenceListener {
 
 	/**
 	 * The component instance that will receive bind and unbind
@@ -39,7 +39,7 @@
 	 *
 	 * @return the bind callback method name.
 	 */
-	String getBindMethodName();
+	String getBindMethod();
 
 	/**
 	 * The name of the method to invoke on the listener component when
@@ -47,5 +47,5 @@
 	 *
 	 * @return the unbind callback method name.
 	 */
-	String getUnbindMethodName();
+	String getUnbindMethod();
 }

Propchange: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ReferenceListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -41,7 +41,7 @@
 	 *
 	 * @return the registration callback method name.
 	 */
-	String getRegistrationMethodName();
+	String getRegistrationMethod();
 
 	/**
 	 * The name of the method to invoke on the listener component when
@@ -51,6 +51,6 @@
 	 *
 	 * @return the unregistration callback method name.
 	 */
-	String getUnregistrationMethodName();
+	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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -75,7 +75,7 @@
 	 *
 	 * @return One of AUTO_EXPORT_DISABLED, AUTO_EXPORT_INTERFACES, AUTO_EXPORT_CLASS_HIERARCHY, AUTO_EXPORT_ALL_CLASSES
 	 */
-	int getAutoExportMode();
+	int getAutoExport();
 
 	/**
 	 * The user declared properties to be advertised with the service.

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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -16,7 +16,6 @@
 package org.osgi.service.blueprint.reflect;
 
 import java.util.Collection;
-import java.util.List;
 
 
 /**
@@ -83,6 +82,6 @@
 	 *
 	 * @return an immutable collection of registered ListenerMetadata
 	 */
-	Collection<Listener> getServiceListeners();
+	Collection<ReferenceListener> getReferenceListeners();
 
 }

Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java (original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java Tue Jun 16 17:52:28 2009
@@ -243,8 +243,8 @@
         factoryMetadata.addProperty("id", createValue(context, factoryMetadata.getId()));
         factoryMetadata.setScope(BeanMetadata.SCOPE_SINGLETON);
         factoryMetadata.setRuntimeClass(CmManagedServiceFactory.class);
-        factoryMetadata.setInitMethodName("init");
-        factoryMetadata.setDestroyMethodName("destroy");
+        factoryMetadata.setInitMethod("init");
+        factoryMetadata.setDestroyMethod("destroy");
         factoryMetadata.addProperty("configAdmin", createRef(context, CONFIG_ADMIN_REFERENCE_NAME));
         factoryMetadata.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
         factoryMetadata.addProperty("factoryPid", createValue(context, element.getAttribute(FACTORY_PID_ATTRIBUTE)));
@@ -299,10 +299,10 @@
                         managedComponent.setScope(BeanMetadata.SCOPE_PROTOTYPE);
                         // destroy-method on managed-component has different signature than on regular beans
                         // so we'll handle it differently
-                        String destroyMethod = managedComponent.getDestroyMethodName();
+                        String destroyMethod = managedComponent.getDestroyMethod();
                         if (destroyMethod != null) {
                             factoryMetadata.addProperty("componentDestroyMethod", createValue(context, destroyMethod));
-                            managedComponent.setDestroyMethodName(null);
+                            managedComponent.setDestroyMethod(null);
                         }
                         context.getComponentDefinitionRegistry().registerComponentDefinition(managedComponent);
                         factoryMetadata.addProperty("managedComponentName", createIdRef(context, managedComponent.getId()));
@@ -317,8 +317,8 @@
             MutableBeanMetadata bean = context.createMetadata(MutableBeanMetadata.class);
             bean.setRuntimeClass(ServiceListener.class);
             bean.addProperty("listener", listener.getListenerComponent());
-            bean.addProperty("registerMethod", createValue(context, listener.getRegistrationMethodName()));
-            bean.addProperty("unregisterMethod", createValue(context, listener.getUnregistrationMethodName()));
+            bean.addProperty("registerMethod", createValue(context, listener.getRegistrationMethod()));
+            bean.addProperty("unregisterMethod", createValue(context, listener.getUnregistrationMethod()));
             listenerCollection.addValue(bean);
         }
         factoryMetadata.addProperty("listeners", listenerCollection);
@@ -329,7 +329,7 @@
         mapMetadata.setScope(BeanMetadata.SCOPE_SINGLETON);
         mapMetadata.setId(id);
         mapMetadata.setFactoryComponent(createRef(context, factoryMetadata.getId()));
-        mapMetadata.setFactoryMethodName("getServiceMap");
+        mapMetadata.setFactoryMethod("getServiceMap");
         return mapMetadata;
     }
 
@@ -344,8 +344,8 @@
         // and the configuration object will come from the factory. So we only really need to register
         // ManagedService if the persistentId is not an empty string.
         if (persistentId.length() > 0) {
-            metadata.setInitMethodName("init");
-            metadata.setDestroyMethodName("destroy");
+            metadata.setInitMethod("init");
+            metadata.setDestroyMethod("destroy");
         }
         metadata.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
         metadata.addProperty("configAdmin", createRef(context, CONFIG_ADMIN_REFERENCE_NAME));
@@ -373,8 +373,8 @@
         // and the configuration object will come from the factory. So we only really need to register
         // ManagedService if the persistentId is not an empty string.
         if (persistentId.length() > 0) {
-            metadata.setInitMethodName("init");
-            metadata.setDestroyMethodName("destroy");
+            metadata.setInitMethod("init");
+            metadata.setDestroyMethod("destroy");
         }
         metadata.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
         metadata.addProperty("configAdmin", createRef(context, CONFIG_ADMIN_REFERENCE_NAME));

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java Tue Jun 16 17:52:28 2009
@@ -50,6 +50,7 @@
 import org.osgi.service.blueprint.container.ComponentDefinitionException;
 import org.osgi.service.blueprint.reflect.ReferenceMetadata;
 import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -322,7 +323,7 @@
         /* Inject by ObjectRecipe */
         private Object listener;
         /* Inject by ObjectRecipe */
-        private org.osgi.service.blueprint.reflect.Listener metadata;
+        private ReferenceListener metadata;
 
         private Set<Method> bindMethodsOneArg = new HashSet<Method>();
         private Set<Method> bindMethodsTwoArgs = new HashSet<Method>();
@@ -333,7 +334,7 @@
             this.listener = listener;
         }
 
-        public void setMetadata(org.osgi.service.blueprint.reflect.Listener metadata) {
+        public void setMetadata(ReferenceListener metadata) {
             this.metadata = metadata;
         }
 
@@ -341,7 +342,7 @@
             Set<Class> clazzes = new HashSet<Class>(classes);
             clazzes.add(Object.class);
             Class listenerClass = listener.getClass();
-            String bindName = metadata.getBindMethodName();
+            String bindName = metadata.getBindMethod();
             if (bindName != null) {
                 bindMethodsOneArg.addAll(ReflectionUtils.findCompatibleMethods(listenerClass, bindName, new Class[] { ServiceReference.class }));
                 for (Class clazz : clazzes) {
@@ -351,7 +352,7 @@
                     throw new ComponentDefinitionException("No matching methods found for listener bind method: " + bindName);
                 }
             }
-            String unbindName = metadata.getUnbindMethodName();
+            String unbindName = metadata.getUnbindMethod();
             if (unbindName != null) {
                 unbindMethodsOneArg.addAll(ReflectionUtils.findCompatibleMethods(listenerClass, unbindName, new Class[] { ServiceReference.class }));
                 for (Class clazz : clazzes) {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java Tue Jun 16 17:52:28 2009
@@ -159,15 +159,12 @@
 
     @Override
     protected Class loadClass(String className) {
-        if (type instanceof Class) {
-            try {
-                return ((Class) type).getClassLoader().loadClass(className);
-            } catch (ClassNotFoundException e) {
-                throw new ComponentDefinitionException("Unable to load class " + className + " from recipe " + this, e);
-            }
-        } else {
-            return super.loadClass(className);
-        }
+        return toClass(loadType(className, type instanceof Class ? ((Class) type).getClassLoader() : null));
+    }
+
+    @Override
+    protected Type loadType(String className) {
+        return loadType(className, type instanceof Class ? ((Class) type).getClassLoader() : null);
     }
 
     private Object getInstance() throws ComponentDefinitionException {
@@ -260,45 +257,29 @@
                 it.remove();
             }
         }
-        // Find a direct match with no conversion
-        if (BlueprintContainerImpl.BEHAVIOR_TCK_INJECTION && matches.size() != 1) {
+        // Find a direct match with assignment
+        if (matches.size() != 1) {
             Map<Method, List<Object>> nmatches = new HashMap<Method, List<Object>>();
-            int bestExactMatch = -1;
             for (Method mth : methods) {
                 boolean found = true;
-                int exactMatch = 0;
                 List<Object> match = new ArrayList<Object>();
                 for (int i = 0; i < args.size(); i++) {
-                    if (types.get(i) != null) {
-                        if (!mth.getParameterTypes()[i].isAssignableFrom(types.get(i))) {
-                            found = false;
-                            break;
-                        }
-                        if (mth.getParameterTypes()[i] == types.get(i)) {
-                            exactMatch++;
-                        }
-                    } else {
-                        if (!mth.getParameterTypes()[i].isInstance(args.get(i))) {
-                            found = false;
-                            break;
-                        }
-                        if (args.get(i) != null && mth.getParameterTypes()[i] == args.get(i).getClass()) {
-                            exactMatch++;
-                        }
+                    if (types.get(i) != null && types.get(i) != mth.getParameterTypes()[i]) {
+                        found = false;
+                        break;
+                    }
+                    if (!mth.getParameterTypes()[i].isInstance(args.get(i))) {
+                        found = false;
+                        break;
                     }
                     try {
-                        Object val = convert(args.get(i), mth.getGenericParameterTypes()[i]);
-                        match.add(val);
+                        match.add(convert(args.get(i), mth.getGenericParameterTypes()[i]));
                     } catch (Throwable t) {
                         found = false;
                         break;
                     }
                 }
-                if (found && exactMatch >= bestExactMatch) {
-                    if (exactMatch > bestExactMatch) {
-                        bestExactMatch = exactMatch;
-                        nmatches.clear();
-                    }
+                if (found) {
                     nmatches.put(mth, match);
                 }
             }
@@ -306,7 +287,7 @@
                 matches = nmatches;
             }
         }
-        // Find a direct match
+        // Find a direct match with conversion
         if (matches.size() != 1) {
             Map<Method, List<Object>> nmatches = new HashMap<Method, List<Object>>();
             for (Method mth : methods) {
@@ -333,11 +314,25 @@
                 matches = nmatches;
             }
         }
-        // Start reordering
+        // Start reordering with assignment
+        if (matches.size() != 1 && reorderArguments && args.size() > 1) {
+            Map<Method, List<Object>> nmatches = new HashMap<Method, List<Object>>();
+            for (Method mth : methods) {
+                ArgumentMatcher matcher = new ArgumentMatcher(mth.getGenericParameterTypes(), false);
+                List<Object> match = matcher.match(args, types);
+                if (match != null) {
+                    nmatches.put(mth, match);
+                }
+            }
+            if (nmatches.size() > 0) {
+                matches = nmatches;
+            }
+        }
+        // Start reordering with conversion
         if (matches.size() != 1 && reorderArguments && args.size() > 1) {
             Map<Method, List<Object>> nmatches = new HashMap<Method, List<Object>>();
             for (Method mth : methods) {
-                ArgumentMatcher matcher = new ArgumentMatcher(mth.getGenericParameterTypes());
+                ArgumentMatcher matcher = new ArgumentMatcher(mth.getGenericParameterTypes(), true);
                 List<Object> match = matcher.match(args, types);
                 if (match != null) {
                     nmatches.put(mth, match);
@@ -360,45 +355,29 @@
                 it.remove();
             }
         }
-        // Find a direct match with no conversion
-        if (BlueprintContainerImpl.BEHAVIOR_TCK_INJECTION && matches.size() != 1) {
+        // Find a direct match with assignment
+        if (matches.size() != 1) {
             Map<Constructor, List<Object>> nmatches = new HashMap<Constructor, List<Object>>();
-            int bestExactMatch = -1;
             for (Constructor cns : constructors) {
                 boolean found = true;
-                int exactMatch = 0;
                 List<Object> match = new ArrayList<Object>();
                 for (int i = 0; i < args.size(); i++) {
-                    if (types.get(i) != null) {
-                        if (!toClass(cns.getParameterTypes()[i]).isAssignableFrom(types.get(i))) {
-                            found = false;
-                            break;
-                        }
-                        if (cns.getParameterTypes()[i] == types.get(i)) {
-                            exactMatch++;
-                        }
-                    } else {
-                        if (!cns.getParameterTypes()[i].isInstance(args.get(i))) {
-                            found = false;
-                            break;
-                        }
-                        if (args.get(i) != null && cns.getParameterTypes()[i] == args.get(i).getClass()) {
-                            exactMatch++;
-                        }
+                    if (types.get(i) != null && types.get(i) != cns.getParameterTypes()[i]) {
+                        found = false;
+                        break;
+                    }
+                    if (!cns.getParameterTypes()[i].isInstance(args.get(i))) {
+                        found = false;
+                        break;
                     }
                     try {
-                        Object val = convert(args.get(i), cns.getGenericParameterTypes()[i]);
-                        match.add(val);
+                        match.add(convert(args.get(i), cns.getGenericParameterTypes()[i]));
                     } catch (Throwable t) {
                         found = false;
                         break;
                     }
                 }
-                if (found && exactMatch >= bestExactMatch) {
-                    if (exactMatch > bestExactMatch) {
-                        bestExactMatch = exactMatch;
-                        nmatches.clear();
-                    }
+                if (found) {
                     nmatches.put(cns, match);
                 }
             }
@@ -406,7 +385,7 @@
                 matches = nmatches;
             }
         }
-        // Find a direct match
+        // Find a direct match with conversion
         if (matches.size() != 1) {
             Map<Constructor, List<Object>> nmatches = new HashMap<Constructor, List<Object>>();
             for (Constructor cns : constructors) {
@@ -433,11 +412,25 @@
                 matches = nmatches;
             }
         }
-        // Start reordering
+        // Start reordering with assignment
         if (matches.size() != 1 && reorderArguments && arguments.size() > 1) {
             Map<Constructor, List<Object>> nmatches = new HashMap<Constructor, List<Object>>();
             for (Constructor cns : constructors) {
-                ArgumentMatcher matcher = new ArgumentMatcher(cns.getGenericParameterTypes());
+                ArgumentMatcher matcher = new ArgumentMatcher(cns.getGenericParameterTypes(), false);
+                List<Object> match = matcher.match(args, types);
+                if (match != null) {
+                    nmatches.put(cns, match);
+                }
+            }
+            if (nmatches.size() > 0) {
+                matches = nmatches;
+            }
+        }
+        // Start reordering with conversion
+        if (matches.size() != 1 && reorderArguments && arguments.size() > 1) {
+            Map<Constructor, List<Object>> nmatches = new HashMap<Constructor, List<Object>>();
+            for (Constructor cns : constructors) {
+                ArgumentMatcher matcher = new ArgumentMatcher(cns.getGenericParameterTypes(), true);
                 List<Object> match = matcher.match(args, types);
                 if (match != null) {
                     nmatches.put(cns, match);
@@ -632,12 +625,14 @@
     private class ArgumentMatcher {
 
         private List<TypeEntry> entries;
+        private boolean convert;
 
-        public ArgumentMatcher(Type[] types) {
+        public ArgumentMatcher(Type[] types, boolean convert) {
             entries = new ArrayList<TypeEntry>();
             for (Type type : types) {
                 entries.add(new TypeEntry(type));
             }
+            this.convert = convert;
         }
 
         public List<Object> match(List<Object> arguments, List<Class> forcedTypes) {
@@ -681,6 +676,9 @@
                         continue;
                     }
                 } else if (arg != null) {
+                    if (!convert && !toClass(entry.type).isInstance(arg)) {
+                        continue;
+                    }
                     try {
                         val = convert(arg, entry.type);
                     } catch (Throwable t) {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java Tue Jun 16 17:52:28 2009
@@ -65,7 +65,7 @@
 import org.osgi.service.blueprint.reflect.BeanProperty;
 import org.osgi.service.blueprint.reflect.CollectionMetadata;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.MapEntry;
 import org.osgi.service.blueprint.reflect.MapMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
@@ -86,8 +86,6 @@
  */
 public class BlueprintContainerImpl implements ExtendedBlueprintContainer, NamespaceHandlerRegistry.Listener, Runnable, SatisfiableRecipe.SatisfactionListener {
 
-    public static final boolean BEHAVIOR_TCK_INJECTION = true;
-
     private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintContainerImpl.class);
 
     private enum State {
@@ -137,6 +135,11 @@
         this.processors = new ArrayList<Processor>();
     }
 
+    public int getCompliance() {
+        // TODO
+        return 0;
+    }
+
     public Bundle getExtenderBundle() {
         return extenderBundle;
     }
@@ -618,7 +621,7 @@
             }
         }
         if (component instanceof ServiceReferenceMetadata) {
-            for (Listener l : ((ServiceReferenceMetadata) component).getServiceListeners()) {
+            for (ReferenceListener l : ((ServiceReferenceMetadata) component).getReferenceListeners()) {
                 getMetadata(clazz, l.getListenerComponent(), metadatas);
             }
         }

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=785323&r1=785322&r2=785323&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 Tue Jun 16 17:52:28 2009
@@ -61,7 +61,7 @@
         this.executor = Executors.newSingleThreadExecutor();
         ServiceTracker eaTracker = null;
         try {
-            eaTracker = new ServiceTracker(bundleContext, EventAdmin.class.getName(), null);
+            eaTracker = new EvenAdminDispatcher(bundleContext);
         } catch (NoClassDefFoundError e) {
             // Ignore, if the EventAdmin package is not available, just don't use it
         }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintExtender.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintExtender.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintExtender.java Tue Jun 16 17:52:28 2009
@@ -136,6 +136,7 @@
             }
             List<PathElement> paths = HeaderParser.parseHeader(blueprintHeader);
             for (PathElement path : paths) {
+                // TODO: support OSGI-INF/blueprint/*.xml
                 if (path.getName().endsWith("/")) {
                     Enumeration e = bundle.findEntries(path.getName(), "*.xml", false);
                     while (e != null && e.hasMoreElements()) {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java Tue Jun 16 17:52:28 2009
@@ -56,7 +56,7 @@
 import org.apache.geronimo.blueprint.reflect.BeanPropertyImpl;
 import org.apache.geronimo.blueprint.reflect.CollectionMetadataImpl;
 import org.apache.geronimo.blueprint.reflect.IdRefMetadataImpl;
-import org.apache.geronimo.blueprint.reflect.ListenerImpl;
+import org.apache.geronimo.blueprint.reflect.ReferenceListenerImpl;
 import org.apache.geronimo.blueprint.reflect.MapEntryImpl;
 import org.apache.geronimo.blueprint.reflect.MapMetadataImpl;
 import org.apache.geronimo.blueprint.reflect.MetadataUtil;
@@ -75,7 +75,7 @@
 import org.osgi.service.blueprint.reflect.CollectionMetadata;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 import org.osgi.service.blueprint.reflect.IdRefMetadata;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.MapEntry;
 import org.osgi.service.blueprint.reflect.MapMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
@@ -126,7 +126,7 @@
     public static final String REFERENCE_ELEMENT = "reference";
     public static final String REFLIST_ELEMENT = "ref-list";
     public static final String INTERFACES_ELEMENT = "interfaces";
-    public static final String LISTENER_ELEMENT = "listener";
+    public static final String REFERENCE_LISTENER_ELEMENT = "reference-listener";
     public static final String SERVICE_PROPERTIES_ELEMENT = "service-properties";
     public static final String REGISTRATION_LISTENER_ELEMENT = "registration-listener";
     public static final String ENTRY_ELEMENT = "entry";
@@ -481,24 +481,24 @@
             metadata.setDependsOn(parseList(element.getAttribute(DEPENDS_ON_ATTRIBUTE)));
         }
         if (element.hasAttribute(INIT_METHOD_ATTRIBUTE)) {
-            metadata.setInitMethodName(element.getAttribute(INIT_METHOD_ATTRIBUTE));
+            metadata.setInitMethod(element.getAttribute(INIT_METHOD_ATTRIBUTE));
         }
         if (element.hasAttribute(DESTROY_METHOD_ATTRIBUTE)) {
-            metadata.setDestroyMethodName(element.getAttribute(DESTROY_METHOD_ATTRIBUTE));
+            metadata.setDestroyMethod(element.getAttribute(DESTROY_METHOD_ATTRIBUTE));
         }
         if (element.hasAttribute(FACTORY_REF_ATTRIBUTE)) {
             metadata.setFactoryComponent(new RefMetadataImpl(element.getAttribute(FACTORY_REF_ATTRIBUTE)));
         }
         if (element.hasAttribute(FACTORY_METHOD_ATTRIBUTE)) {
             String factoryMethod = element.getAttribute(FACTORY_METHOD_ATTRIBUTE);
-            metadata.setFactoryMethodName(factoryMethod);
+            metadata.setFactoryMethod(factoryMethod);
         }
 
         // Do some validation
         if (metadata.getClassName() == null && metadata.getFactoryComponent() == null) {
             throw new ComponentDefinitionException("Bean class or factory-ref must be specified");
         }
-        if (metadata.getFactoryComponent() != null && metadata.getFactoryMethodName() == null) {
+        if (metadata.getFactoryComponent() != null && metadata.getFactoryMethod() == null) {
             throw new ComponentDefinitionException("factory-method is required when factory-component is set");
         }
 
@@ -572,13 +572,13 @@
         }
         String autoExport = element.hasAttribute(AUTO_EXPORT_ATTRIBUTE) ? element.getAttribute(AUTO_EXPORT_ATTRIBUTE) : AUTO_EXPORT_DEFAULT;
         if (AUTO_EXPORT_DISABLED.equals(autoExport)) {
-            service.setAutoExportMode(ServiceMetadata.AUTO_EXPORT_DISABLED);
+            service.setAutoExport(ServiceMetadata.AUTO_EXPORT_DISABLED);
         } else if (AUTO_EXPORT_INTERFACES.equals(autoExport)) {
-            service.setAutoExportMode(ServiceMetadata.AUTO_EXPORT_INTERFACES);
+            service.setAutoExport(ServiceMetadata.AUTO_EXPORT_INTERFACES);
         } else if (AUTO_EXPORT_CLASS_HIERARCHY.equals(autoExport)) {
-            service.setAutoExportMode(ServiceMetadata.AUTO_EXPORT_CLASS_HIERARCHY);
+            service.setAutoExport(ServiceMetadata.AUTO_EXPORT_CLASS_HIERARCHY);
         } else if (AUTO_EXPORT_ALL.equals(autoExport)) {
-            service.setAutoExportMode(ServiceMetadata.AUTO_EXPORT_ALL_CLASSES);
+            service.setAutoExport(ServiceMetadata.AUTO_EXPORT_ALL_CLASSES);
         } else {
             throw new ComponentDefinitionException("Illegal value (" + autoExport + ") for " + AUTO_EXPORT_ATTRIBUTE + " attribute");
         }
@@ -627,6 +627,10 @@
         if (service.getServiceComponent() == null) {
             throw new ComponentDefinitionException("One of " + REF_ATTRIBUTE + " attribute, " + BEAN_ELEMENT + " element or " + REF_ELEMENT + " element must be set");
         }
+        // Check interface
+        if (service.getAutoExport() == ServiceMetadata.AUTO_EXPORT_DISABLED && service.getInterfaceNames().isEmpty()) {
+            throw new ComponentDefinitionException(INTERFACE_ATTRIBUTE + " attribute or " + INTERFACES_ELEMENT + " element must be set when " + AUTO_EXPORT_ATTRIBUTE + " is set to " + AUTO_EXPORT_DISABLED);
+        }
         
         ComponentMetadata s = service;
         
@@ -794,12 +798,12 @@
         String registrationMethod = null;
         if (element.hasAttribute(REGISTRATION_METHOD_ATTRIBUTE)) {
             registrationMethod = element.getAttribute(REGISTRATION_METHOD_ATTRIBUTE);
-            listener.setRegistrationMethodName(registrationMethod);
+            listener.setRegistrationMethod(registrationMethod);
         }
         String unregistrationMethod = null;
         if (element.hasAttribute(UNREGISTRATION_METHOD_ATTRIBUTE)) {
             unregistrationMethod = element.getAttribute(UNREGISTRATION_METHOD_ATTRIBUTE);
-            listener.setUnregistrationMethodName(unregistrationMethod);
+            listener.setUnregistrationMethod(unregistrationMethod);
         }
         if (registrationMethod == null && unregistrationMethod == null) {
             throw new ComponentDefinitionException("One of " + REGISTRATION_METHOD_ATTRIBUTE + " or " + UNREGISTRATION_METHOD_ATTRIBUTE + " must be set");
@@ -942,7 +946,7 @@
             if (node instanceof Element) {
                 Element e = (Element) node;
                 if (isBlueprintNamespace(e.getNamespaceURI())) {
-                    if (nodeNameEquals(e, LISTENER_ELEMENT)) {
+                    if (nodeNameEquals(e, REFERENCE_LISTENER_ELEMENT)) {
                         reference.addServiceListener(parseServiceListener(e, reference));
                     }
                 }
@@ -950,8 +954,8 @@
         }
     }
 
-    private Listener parseServiceListener(Element element, ComponentMetadata enclosingComponent) {
-        ListenerImpl listener = new ListenerImpl();
+    private ReferenceListener parseServiceListener(Element element, ComponentMetadata enclosingComponent) {
+        ReferenceListenerImpl listener = new ReferenceListenerImpl();
         Metadata listenerComponent = null;
         // Parse attributes
         if (element.hasAttribute(REF_ATTRIBUTE)) {
@@ -961,11 +965,11 @@
         String unbindMethodName = null;
         if (element.hasAttribute(BIND_METHOD_ATTRIBUTE)) {
             bindMethodName = element.getAttribute(BIND_METHOD_ATTRIBUTE);
-            listener.setBindMethodName(bindMethodName);
+            listener.setBindMethod(bindMethodName);
         }
         if (element.hasAttribute(UNBIND_METHOD_ATTRIBUTE)) {
             unbindMethodName = element.getAttribute(UNBIND_METHOD_ATTRIBUTE);
-            listener.setUnbindMethodName(unbindMethodName);
+            listener.setUnbindMethod(unbindMethodName);
         }
         if (bindMethodName == null && unbindMethodName == null) {
             throw new ComponentDefinitionException("One of " + BIND_METHOD_ATTRIBUTE + " or " + UNBIND_METHOD_ATTRIBUTE + " must be set");

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java Tue Jun 16 17:52:28 2009
@@ -45,7 +45,7 @@
 import org.osgi.service.blueprint.reflect.CollectionMetadata;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 import org.osgi.service.blueprint.reflect.IdRefMetadata;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.MapEntry;
 import org.osgi.service.blueprint.reflect.MapMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
@@ -114,9 +114,9 @@
 
     private Recipe createRefCollectionRecipe(RefListMetadata metadata) throws Exception {
         CollectionRecipe listenersRecipe = null;
-        if (metadata.getServiceListeners() != null) {
+        if (metadata.getReferenceListeners() != null) {
             listenersRecipe = new CollectionRecipe(getName(null), ArrayList.class);
-            for (Listener listener : metadata.getServiceListeners()) {
+            for (ReferenceListener listener : metadata.getReferenceListeners()) {
                 listenersRecipe.add(createRecipe(listener));
             }
         }
@@ -134,9 +134,9 @@
 
     private ReferenceRecipe createReferenceRecipe(ReferenceMetadata metadata) throws Exception {
         CollectionRecipe listenersRecipe = null;
-        if (metadata.getServiceListeners() != null) {
+        if (metadata.getReferenceListeners() != null) {
             listenersRecipe = new CollectionRecipe(getName(null), ArrayList.class);
-            for (Listener listener : metadata.getServiceListeners()) {
+            for (ReferenceListener listener : metadata.getReferenceListeners()) {
                 listenersRecipe.add(createRecipe(listener));
             }
         }
@@ -200,8 +200,8 @@
         if (!BeanMetadata.SCOPE_PROTOTYPE.equals(beanMetadata.getScope())) {
             recipe.setPrototype(false);
         }
-        recipe.setInitMethod(beanMetadata.getInitMethodName());
-        recipe.setDestroyMethod(beanMetadata.getDestroyMethodName());
+        recipe.setInitMethod(beanMetadata.getInitMethod());
+        recipe.setDestroyMethod(beanMetadata.getDestroyMethod());
         List<BeanArgument> beanArguments = beanMetadata.getArguments();
         if (beanArguments != null && !beanArguments.isEmpty()) {
             boolean hasIndex = (beanArguments.get(0).getIndex() >= 0);
@@ -221,7 +221,7 @@
             recipe.setArgTypes(argTypes);
             recipe.setReorderArguments(!hasIndex);
         }
-        recipe.setFactoryMethod(beanMetadata.getFactoryMethodName());
+        recipe.setFactoryMethod(beanMetadata.getFactoryMethod());
         if (beanMetadata.getFactoryComponent() != null) {
             recipe.setFactoryComponent(getValue(beanMetadata.getFactoryComponent(), null));
         }
@@ -235,16 +235,16 @@
     private Recipe createRecipe(RegistrationListener listener) throws Exception {
         BeanRecipe recipe = new BeanRecipe(getName(null), blueprintContainer, ServiceListener.class);
         recipe.setProperty("listener", getValue(listener.getListenerComponent(), null));
-        if (listener.getRegistrationMethodName() != null) {
-            recipe.setProperty("registerMethod", listener.getRegistrationMethodName());
+        if (listener.getRegistrationMethod() != null) {
+            recipe.setProperty("registerMethod", listener.getRegistrationMethod());
         }
-        if (listener.getUnregistrationMethodName() != null) {
-            recipe.setProperty("unregisterMethod", listener.getUnregistrationMethodName());
+        if (listener.getUnregistrationMethod() != null) {
+            recipe.setProperty("unregisterMethod", listener.getUnregistrationMethod());
         }
         return recipe;
     }
 
-    private Recipe createRecipe(Listener listener) throws Exception {
+    private Recipe createRecipe(ReferenceListener listener) throws Exception {
         BeanRecipe recipe = new BeanRecipe(getName(null), blueprintContainer, AbstractServiceReferenceRecipe.Listener.class);
         recipe.setProperty("listener", getValue(listener.getListenerComponent(), null));
         recipe.setProperty("metadata", listener);

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java Tue Jun 16 17:52:28 2009
@@ -110,11 +110,23 @@
     }
 
     protected void track(ServiceReference ref) {
-        retrack();
+        // TODO: make this behavior configurable through a custom attribute
+        // TODO:      policy = sticky | replace
+        synchronized (monitor) {
+            if (trackedServiceReference != null) {
+                retrack();
+            }
+        }
     }
 
     protected void untrack(ServiceReference ref) {
-        retrack();
+        // TODO: make this behavior configurable through a custom attribute
+        // TODO:      policy = sticky | replace
+        synchronized (monitor) {
+            if (trackedServiceReference == ref) {
+                retrack();
+            }
+        }
     }
 
     private void bind(ServiceReference ref) {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Tue Jun 16 17:52:28 2009
@@ -269,7 +269,7 @@
 
     private Set<String> getClasses() {
         Set<String> classes;
-        switch (metadata.getAutoExportMode()) {
+        switch (metadata.getAutoExport()) {
             case ServiceMetadata.AUTO_EXPORT_INTERFACES:
                 classes = ReflectionUtils.getImplementedInterfaces(new HashSet<String>(), internalGetService().getClass());
                 break;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java Tue Jun 16 17:52:28 2009
@@ -20,8 +20,12 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.osgi.service.blueprint.container.ComponentDefinitionException;
+import static org.apache.geronimo.blueprint.utils.TypeUtils.toClass;
+import org.apache.geronimo.blueprint.utils.TypeUtils;
 
 public abstract class AbstractRecipe implements Recipe {
 
@@ -85,10 +89,21 @@
     }
 
     protected Class loadClass(String className) {
+        return toClass(loadType(className, null));
+    }
+
+    protected Type loadType(String typeName) {
+        return loadType(typeName, null);
+    }
+
+    protected Type loadType(String typeName, ClassLoader fromClassLoader) {
+        if (typeName == null) {
+            return null;
+        }
         try {
-            return ExecutionContext.getContext().loadClass(className);
+            return TypeUtils.parseJavaType(typeName, fromClassLoader != null ? fromClassLoader : ExecutionContext.getContext());
         } catch (ClassNotFoundException e) {
-            throw new ComponentDefinitionException("Unable to load class " + className + " from recipe " + this, e);
+            throw new ComponentDefinitionException("Unable to load class " + typeName + " from recipe " + this, e);
         }
     }
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ArrayRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ArrayRecipe.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ArrayRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ArrayRecipe.java Tue Jun 16 17:52:28 2009
@@ -17,10 +17,12 @@
 package org.apache.geronimo.blueprint.di;
 
 import java.lang.reflect.Array;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.osgi.service.blueprint.container.ComponentDefinitionException;
+import static org.apache.geronimo.blueprint.utils.TypeUtils.toClass;
 
 /**
  * @version $Rev$ $Date$
@@ -47,11 +49,11 @@
     }
 
     protected Object internalCreate() throws ComponentDefinitionException {
-        Class type;
+        Type type;
         if (this.type instanceof Class) {
             type = (Class) this.type;
         } else if (this.type instanceof String) {
-            type = loadClass((String) this.type);
+            type = loadType((String) this.type);
         } else {
             type = Object.class;
         }
@@ -59,9 +61,9 @@
         // create array instance
         Object array;
         try {
-            array = Array.newInstance(type, list.size());
+            array = Array.newInstance(toClass(type), list.size());
         } catch (Exception e) {
-            throw new ComponentDefinitionException("Error while creating array instance: " + type.getName());
+            throw new ComponentDefinitionException("Error while creating array instance: " + toClass(type));
         }
 
         int index = 0;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java Tue Jun 16 17:52:28 2009
@@ -130,32 +130,7 @@
         return ConversionUtils.convert(value, type, blueprintContainer.getConverter());
     }
 
-    private static Map<String, Class> primitiveClasses = new HashMap<String, Class>();
-
-    static {
-        primitiveClasses.put("int", int.class);
-        primitiveClasses.put("short", short.class);
-        primitiveClasses.put("long", long.class);
-        primitiveClasses.put("byte", byte.class);
-        primitiveClasses.put("char", char.class);
-        primitiveClasses.put("float", float.class);
-        primitiveClasses.put("double", double.class);
-        primitiveClasses.put("boolean", boolean.class);
-    }
-
     public Class loadClass(String typeName) throws ClassNotFoundException {
-        if (typeName == null) {
-            return null;
-        }
-        Class clazz = primitiveClasses.get(typeName);
-        if (clazz == null && typeName.startsWith("java.")) {
-            // We can bypass classes starting with "java." because they are always delegated
-            // to the system bundle, so we'll end up with the same class in all cases 
-            clazz = getClass().getClassLoader().loadClass(typeName);
-        }
-        if (clazz == null) {
-            clazz = blueprintContainer.loadClass(typeName);
-        }
-        return clazz;
+        return blueprintContainer.loadClass(typeName);
     }
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/AbstractPropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/AbstractPropertyPlaceholder.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/AbstractPropertyPlaceholder.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/AbstractPropertyPlaceholder.java Tue Jun 16 17:52:28 2009
@@ -29,7 +29,7 @@
 import org.apache.geronimo.blueprint.mutable.MutableBeanMetadata;
 import org.apache.geronimo.blueprint.mutable.MutableBeanProperty;
 import org.apache.geronimo.blueprint.mutable.MutableCollectionMetadata;
-import org.apache.geronimo.blueprint.mutable.MutableListener;
+import org.apache.geronimo.blueprint.mutable.MutableReferenceListener;
 import org.apache.geronimo.blueprint.mutable.MutableMapEntry;
 import org.apache.geronimo.blueprint.mutable.MutableMapMetadata;
 import org.apache.geronimo.blueprint.mutable.MutablePropsMetadata;
@@ -40,7 +40,7 @@
 import org.osgi.service.blueprint.reflect.BeanMetadata;
 import org.osgi.service.blueprint.reflect.BeanProperty;
 import org.osgi.service.blueprint.reflect.CollectionMetadata;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.MapEntry;
 import org.osgi.service.blueprint.reflect.MapMetadata;
 import org.osgi.service.blueprint.reflect.Metadata;
@@ -136,15 +136,15 @@
     }
 
     protected Metadata processReferenceMetadata(ReferenceMetadata component) {
-        for (Listener listener : component.getServiceListeners()) {
-            ((MutableListener) listener).setListenerComponent((Target) processMetadata(listener.getListenerComponent()));
+        for (ReferenceListener listener : component.getReferenceListeners()) {
+            ((MutableReferenceListener) listener).setListenerComponent((Target) processMetadata(listener.getListenerComponent()));
         }
         return component;
     }
 
     protected Metadata processRefCollectionMetadata(RefListMetadata component) {
-        for (Listener listener : component.getServiceListeners()) {
-            ((MutableListener) listener).setListenerComponent((Target) processMetadata(listener.getListenerComponent()));
+        for (ReferenceListener listener : component.getReferenceListeners()) {
+            ((MutableReferenceListener) listener).setListenerComponent((Target) processMetadata(listener.getListenerComponent()));
         }
         return component;
     }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/ExtNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/ExtNamespaceHandler.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/ExtNamespaceHandler.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ext/ExtNamespaceHandler.java Tue Jun 16 17:52:28 2009
@@ -172,7 +172,7 @@
         metadata.setId(getId(context, element));
         metadata.setScope(BeanMetadata.SCOPE_SINGLETON);
         metadata.setRuntimeClass(PropertyPlaceholder.class);
-        metadata.setInitMethodName("init");
+        metadata.setInitMethod("init");
         String prefix = element.hasAttribute(PLACEHOLDER_PREFIX_ATTRIBUTE)
                                     ? element.getAttribute(PLACEHOLDER_PREFIX_ATTRIBUTE)
                                     : "${";

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableBeanMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableBeanMetadata.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableBeanMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableBeanMetadata.java Tue Jun 16 17:52:28 2009
@@ -34,9 +34,9 @@
 
     void setClassName(String className);
 
-    void setInitMethodName(String initMethodName);
+    void setInitMethod(String initMethodName);
 
-    void setDestroyMethodName(String destroyMethodName);
+    void setDestroyMethod(String destroyMethodName);
 
     void addArgument(BeanArgument argument);
 
@@ -50,7 +50,7 @@
 
     void removeProperty(BeanProperty property);
 
-    void setFactoryMethodName(String factoryMethodName);
+    void setFactoryMethod(String factoryMethodName);
 
     void setFactoryComponent(Target factoryComponent);
 

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableReferenceListener.java (from r784675, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableListener.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableReferenceListener.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableReferenceListener.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableListener.java&r1=784675&r2=785323&rev=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableReferenceListener.java Tue Jun 16 17:52:28 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.geronimo.blueprint.mutable;
 
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.Target;
 
 /**
@@ -27,12 +27,12 @@
  * @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
  * @version $Rev: 766508 $, $Date: 2009-04-19 22:09:27 +0200 (Sun, 19 Apr 2009) $
  */
-public interface MutableListener extends Listener {
+public interface MutableReferenceListener extends ReferenceListener {
 
     void setListenerComponent(Target listenerComponent);
 
-    void setBindMethodName(String bindMethodName);
+    void setBindMethod(String bindMethodName);
 
-    void setUnbindMethodName(String unbindMethodName);
+    void setUnbindMethod(String unbindMethodName);
 
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableRegistrationListener.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableRegistrationListener.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableRegistrationListener.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableRegistrationListener.java Tue Jun 16 17:52:28 2009
@@ -31,8 +31,8 @@
 
     void setListenerComponent(Target listenerComponent);
 
-    void setRegistrationMethodName(String registrationMethodName);
+    void setRegistrationMethod(String registrationMethodName);
 
-    void setUnregistrationMethodName(String unregistrationMethodName);
+    void setUnregistrationMethod(String unregistrationMethodName);
 
 }
\ No newline at end of file

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceMetadata.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceMetadata.java Tue Jun 16 17:52:28 2009
@@ -39,7 +39,7 @@
 
     void removeInterfaceName(String interfaceName);
 
-    void setAutoExportMode(int autoExportMode);
+    void setAutoExport(int autoExportMode);
 
     void addServiceProperty(MapEntry serviceProperty);
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceReferenceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceReferenceMetadata.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceReferenceMetadata.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableServiceReferenceMetadata.java Tue Jun 16 17:52:28 2009
@@ -19,7 +19,7 @@
 package org.apache.geronimo.blueprint.mutable;
 
 import org.apache.geronimo.blueprint.ExtendedServiceReferenceMetadata;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.Target;
 
 /**
@@ -36,13 +36,13 @@
 
     void setComponentName(String componentName);
 
-    void addServiceListener(Listener listener);
+    void addServiceListener(ReferenceListener listener);
 
-    Listener addServiceListener(Target listenerComponent,
+    ReferenceListener addServiceListener(Target listenerComponent,
                                 String bindMethodName,
                                 String unbindMethodName);
 
-    void removeServiceListener(Listener listener);
+    void removeReferenceListener(ReferenceListener listener);
 
     void setProxyMethod(int proxyMethod);
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java Tue Jun 16 17:52:28 2009
@@ -38,12 +38,12 @@
 public class BeanMetadataImpl extends ComponentMetadataImpl implements MutableBeanMetadata {
 
     private String className;
-    private String initMethodName;
-    private String destroyMethodName;
+    private String initMethod;
+    private String destroyMethod;
     private List<BeanArgument> arguments;
     private List<BeanProperty> properties;
     private int initialization;
-    private String factoryMethodName;
+    private String factoryMethod;
     private Target factoryComponent;
     private String scope;
     private Class runtimeClass;
@@ -56,8 +56,8 @@
     public BeanMetadataImpl(BeanMetadata source) {
         super(source);
         this.className = source.getClassName();
-        this.initMethodName = source.getInitMethodName();
-        this.destroyMethodName = source.getDestroyMethodName();
+        this.initMethod = source.getInitMethod();
+        this.destroyMethod = source.getDestroyMethod();
         for (BeanArgument argument : source.getArguments()) {
             addArgument(new BeanArgumentImpl(argument));
         }
@@ -65,7 +65,7 @@
             addProperty(new BeanPropertyImpl(property));
         }
         this.initialization = source.getInitialization();
-        this.factoryMethodName = source.getFactoryMethodName();
+        this.factoryMethod = source.getFactoryMethod();
         this.factoryComponent = MetadataUtil.cloneTarget(source.getFactoryComponent());
         this.scope = source.getScope();
         this.runtimeClass = source.getRuntimeClass();
@@ -80,20 +80,20 @@
         this.className = className;
     }
 
-    public String getInitMethodName() {
-        return initMethodName;
+    public String getInitMethod() {
+        return initMethod;
     }
 
-    public void setInitMethodName(String initMethodName) {
-        this.initMethodName = initMethodName;
+    public void setInitMethod(String initMethodName) {
+        this.initMethod = initMethodName;
     }
 
-    public String getDestroyMethodName() {
-        return destroyMethodName;
+    public String getDestroyMethod() {
+        return destroyMethod;
     }
 
-    public void setDestroyMethodName(String destroyMethodName) {
-        this.destroyMethodName = destroyMethodName;
+    public void setDestroyMethod(String destroyMethodName) {
+        this.destroyMethod = destroyMethodName;
     }
 
     public List<BeanArgument> getArguments() {
@@ -158,12 +158,12 @@
         }
     }
 
-    public String getFactoryMethodName() {
-        return this.factoryMethodName;
+    public String getFactoryMethod() {
+        return this.factoryMethod;
     }
 
-    public void setFactoryMethodName(String factoryMethodName) {
-        this.factoryMethodName = factoryMethodName;
+    public void setFactoryMethod(String factoryMethodName) {
+        this.factoryMethod = factoryMethodName;
     }
 
     public Target getFactoryComponent() {
@@ -205,11 +205,11 @@
                 ", initialization=" + initialization +
                 ", dependsOn=" + dependsOn +
                 ", className='" + className + '\'' +
-                ", initMethodName='" + initMethodName + '\'' +
-                ", destroyMethodName='" + destroyMethodName + '\'' +
+                ", initMethodName='" + initMethod + '\'' +
+                ", destroyMethodName='" + destroyMethod + '\'' +
                 ", arguments=" + arguments +
                 ", properties=" + properties +
-                ", factoryMethodName='" + factoryMethodName + '\'' +
+                ", factoryMethodName='" + factoryMethod + '\'' +
                 ", factoryComponent=" + factoryComponent +
                 ", scope='" + scope + '\'' +
                 ", runtimeClass=" + runtimeClass +

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefListMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefListMetadataImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefListMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefListMetadataImpl.java Tue Jun 16 17:52:28 2009
@@ -57,7 +57,7 @@
                 ", interfaceName='" + interfaceName + '\'' +
                 ", componentName='" + componentName + '\'' +
                 ", filter='" + filter + '\'' +
-                ", serviceListeners=" + serviceListeners +
+                ", serviceListeners=" + referenceListeners +
                 ", memberType=" + memberType +
                 ']';
     }

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListenerImpl.java (from r784675, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListenerImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListenerImpl.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListenerImpl.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListenerImpl.java&r1=784675&r2=785323&rev=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListenerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListenerImpl.java Tue Jun 16 17:52:28 2009
@@ -18,8 +18,8 @@
  */
 package org.apache.geronimo.blueprint.reflect;
 
-import org.apache.geronimo.blueprint.mutable.MutableListener;
-import org.osgi.service.blueprint.reflect.Listener;
+import org.apache.geronimo.blueprint.mutable.MutableReferenceListener;
+import org.osgi.service.blueprint.reflect.ReferenceListener;
 import org.osgi.service.blueprint.reflect.Target;
 
 /**
@@ -28,25 +28,25 @@
  * @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 ListenerImpl implements MutableListener {
+public class ReferenceListenerImpl implements MutableReferenceListener {
 
     private Target listenerComponent;
-    private String bindMethodName;
-    private String unbindMethodName;
+    private String bindMethod;
+    private String unbindMethod;
 
-    public ListenerImpl() {
+    public ReferenceListenerImpl() {
     }
 
-    public ListenerImpl(Target listenerComponent, String bindMethodName, String unbindMethodName) {
+    public ReferenceListenerImpl(Target listenerComponent, String bindMethod, String unbindMethod) {
         this.listenerComponent = listenerComponent;
-        this.bindMethodName = bindMethodName;
-        this.unbindMethodName = unbindMethodName;
+        this.bindMethod = bindMethod;
+        this.unbindMethod = unbindMethod;
     }
 
-    public ListenerImpl(Listener source) {
+    public ReferenceListenerImpl(ReferenceListener source) {
         this.listenerComponent = MetadataUtil.cloneTarget(source.getListenerComponent());
-        this.bindMethodName = source.getBindMethodName();
-        this.unbindMethodName = source.getUnbindMethodName();
+        this.bindMethod = source.getBindMethod();
+        this.unbindMethod = source.getUnbindMethod();
     }
 
     public Target getListenerComponent() {
@@ -57,28 +57,28 @@
         this.listenerComponent = listenerComponent;
     }
 
-    public String getBindMethodName() {
-        return this.bindMethodName;
+    public String getBindMethod() {
+        return this.bindMethod;
     }
 
-    public void setBindMethodName(String bindMethodName) {
-        this.bindMethodName = bindMethodName;
+    public void setBindMethod(String bindMethodName) {
+        this.bindMethod = bindMethodName;
     }
 
-    public String getUnbindMethodName() {
-        return this.unbindMethodName;
+    public String getUnbindMethod() {
+        return this.unbindMethod;
     }
 
-    public void setUnbindMethodName(String unbindMethodName) {
-        this.unbindMethodName = unbindMethodName;
+    public void setUnbindMethod(String unbindMethodName) {
+        this.unbindMethod = unbindMethodName;
     }
 
     @Override
     public String toString() {
         return "Listener[" +
                 "listenerComponent=" + listenerComponent +
-                ", bindMethodName='" + bindMethodName + '\'' +
-                ", unbindMethodName='" + unbindMethodName + '\'' +
+                ", bindMethodName='" + bindMethod + '\'' +
+                ", unbindMethodName='" + unbindMethod + '\'' +
                 ']';
     }
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java Tue Jun 16 17:52:28 2009
@@ -57,7 +57,7 @@
                 ", interfaceName='" + interfaceName + '\'' +
                 ", componentName='" + componentName + '\'' +
                 ", filter='" + filter + '\'' +
-                ", serviceListeners=" + serviceListeners +
+                ", serviceListeners=" + referenceListeners +
                 ", timeout=" + timeout +
                 ']';
     }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerImpl.java Tue Jun 16 17:52:28 2009
@@ -31,22 +31,22 @@
 public class RegistrationListenerImpl implements MutableRegistrationListener {
 
     private Target listenerComponent;
-    private String registrationMethodName;
-    private String unregistrationMethodName;
+    private String registrationMethod;
+    private String unregistrationMethod;
 
     public RegistrationListenerImpl() {
     }
 
-    public RegistrationListenerImpl(Target listenerComponent, String registrationMethodName, String unregistrationMethodName) {
+    public RegistrationListenerImpl(Target listenerComponent, String registrationMethod, String unregistrationMethod) {
         this.listenerComponent = listenerComponent;
-        this.registrationMethodName = registrationMethodName;
-        this.unregistrationMethodName = unregistrationMethodName;
+        this.registrationMethod = registrationMethod;
+        this.unregistrationMethod = unregistrationMethod;
     }
 
     public RegistrationListenerImpl(RegistrationListener source) {
         listenerComponent = MetadataUtil.cloneTarget(source.getListenerComponent());
-        registrationMethodName = source.getRegistrationMethodName();
-        unregistrationMethodName = source.getUnregistrationMethodName();
+        registrationMethod = source.getRegistrationMethod();
+        unregistrationMethod = source.getUnregistrationMethod();
     }
 
     public Target getListenerComponent() {
@@ -57,28 +57,28 @@
         this.listenerComponent = listenerComponent;
     }
 
-    public String getRegistrationMethodName() {
-        return registrationMethodName;
+    public String getRegistrationMethod() {
+        return registrationMethod;
     }
 
-    public void setRegistrationMethodName(String registrationMethodName) {
-        this.registrationMethodName = registrationMethodName;
+    public void setRegistrationMethod(String registrationMethod) {
+        this.registrationMethod = registrationMethod;
     }
 
-    public String getUnregistrationMethodName() {
-        return unregistrationMethodName;
+    public String getUnregistrationMethod() {
+        return unregistrationMethod;
     }
 
-    public void setUnregistrationMethodName(String unregistrationMethodName) {
-        this.unregistrationMethodName = unregistrationMethodName;
+    public void setUnregistrationMethod(String unregistrationMethod) {
+        this.unregistrationMethod = unregistrationMethod;
     }
 
     @Override
     public String toString() {
         return "RegistrationListener[" +
                 "listenerComponent=" + listenerComponent +
-                ", registrationMethodName='" + registrationMethodName + '\'' +
-                ", unregistrationMethodName='" + unregistrationMethodName + '\'' +
+                ", registrationMethodName='" + registrationMethod + '\'' +
+                ", unregistrationMethodName='" + unregistrationMethod + '\'' +
                 ']';
     }
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java?rev=785323&r1=785322&r2=785323&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java Tue Jun 16 17:52:28 2009
@@ -41,7 +41,7 @@
 
     private Target serviceComponent;
     private List<String> interfaceNames;
-    private int autoExportMode;
+    private int autoExport;
     private List<MapEntry> serviceProperties;
     private int ranking;
     private Collection<RegistrationListener> registrationListeners;
@@ -53,7 +53,7 @@
         super(source);
         this.serviceComponent = MetadataUtil.cloneTarget(source.getServiceComponent());
         this.interfaceNames = new ArrayList<String>(source.getInterfaceNames());
-        this.autoExportMode = source.getAutoExportMode();
+        this.autoExport = source.getAutoExport();
         for (MapEntry serviceProperty : source.getServiceProperties()) {
             addServiceProperty(new MapEntryImpl(serviceProperty));
         }
@@ -96,12 +96,12 @@
         }
     }
 
-    public int getAutoExportMode() {
-        return this.autoExportMode;
+    public int getAutoExport() {
+        return this.autoExport;
     }
 
-    public void setAutoExportMode(int autoExportMode) {
-        this.autoExportMode = autoExportMode;
+    public void setAutoExport(int autoExport) {
+        this.autoExport = autoExport;
     }
 
     public List<MapEntry> getServiceProperties() {
@@ -182,7 +182,7 @@
                 ", dependsOn=" + dependsOn +
                 ", exportedComponent=" + serviceComponent +
                 ", interfaceNames=" + interfaceNames +
-                ", autoExportMode=" + autoExportMode +
+                ", autoExportMode=" + autoExport +
                 ", serviceProperties=" + serviceProperties +
                 ", ranking=" + ranking +
                 ", registrationListeners=" + registrationListeners +



Mime
View raw message