You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/11/01 19:31:24 UTC

svn commit: r591112 [1/2] - in /incubator/tuscany/java/sca/modules: contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ contribution/src/main/java/org/apache/tuscany/sca/contribution/ contribution/src/main/java/org/apache/tuscany/...

Author: svkrish
Date: Thu Nov  1 11:31:21 2007
New Revision: 591112

URL: http://svn.apache.org/viewvc?rev=591112&view=rev
Log:
applying patch submitted in https://issues.apache.org/jira/browse/TUSCANY-1877

Added:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDeclaration.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDiscovery.java
    incubator/tuscany/java/sca/modules/core/src/main/resources/
    incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/
    incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/
    incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
Removed:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceConfigurationUtil.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/ServiceConfigurationUtil.java
Modified:
    incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionClassLoader.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
    incubator/tuscany/java/sca/modules/databinding/pom.xml
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
    incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
    incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
    incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
    incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
    incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
    incubator/tuscany/java/sca/modules/interface-java/pom.xml
    incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
    incubator/tuscany/java/sca/modules/policy/pom.xml
    incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicySetHandlerUtil.java

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionClassLoader.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionClassLoader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionClassLoader.java Thu Nov  1 11:31:21 2007
@@ -24,9 +24,9 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Iterator;
 
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Export;
@@ -192,7 +192,7 @@
     @Override
     public Enumeration<URL> findResources(String name) throws IOException {
               
-        return collectionToEnumeration(findResourceSet(name));
+        return Collections.enumeration(findResourceSet(name));
     }
     
     
@@ -236,7 +236,7 @@
         HashSet<URL> resourceSet = findResourceSet(resName);
         addEnumerationToCollection(resourceSet, super.getResources(resName));
         
-        return collectionToEnumeration(resourceSet);
+        return Collections.enumeration(resourceSet);
     }
     
 
@@ -344,25 +344,7 @@
             collection.add(enumeration.nextElement());
     }
     
-    /*
-     * Return an enumeration corresponding to a collection
-     */
-    private <T extends Object> Enumeration<T>  collectionToEnumeration(Collection<T> collection) {
-        
-        final Iterator<T> iterator = collection.iterator();
-        
-        return new Enumeration<T>() {
-            public boolean hasMoreElements() {
-                return iterator.hasNext();
-            }
-
-            public T nextElement() {
-                return iterator.next();
-            }
-        };
-    }
-
-
+    
     @Override
     public String toString() {
         return "SCA contribution classloader for : " + contribution.getLocation();

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -22,9 +22,8 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.HashMap;
-import java.util.List;
 
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 
 /**
@@ -89,14 +88,10 @@
             if (factoryInterface.isInterface()) {
                 
                 // Dynamically load a factory class declared under META-INF/services 
-                ClassLoader classLoader = factoryInterface.getClassLoader();
-                if (classLoader == null)
-                    classLoader = ClassLoader.getSystemClassLoader();
                 try {
-                    List<String> classNames = ServiceConfigurationUtil.getServiceClassNames(classLoader, factoryInterface.getName());
-                    if (!classNames.isEmpty()) {
-                        Class<?> factoryClass = Class.forName(classNames.iterator().next(), true, classLoader);
-                        
+                	Class<?> factoryClass = ServiceDiscovery.getInstance().loadFirstServiceClass(factoryInterface);
+                    if (factoryClass != null) {
+                    	
                         try {
                             // Default empty constructor
                             Constructor<?> constructor = factoryClass.getConstructor();

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -28,9 +28,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 /**
  * Default implementation of ContributionProcessorRegistry
@@ -63,23 +65,21 @@
             return;
 
         // Get the processor service declarations
-        ClassLoader classLoader = PackageProcessor.class.getClassLoader();
-        List<String> processorDeclarations; 
+        Set<ServiceDeclaration> processorDeclarations; 
         try {
-            processorDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, PackageProcessor.class.getName());
+            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(PackageProcessor.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
-        for (String processorDeclaration: processorDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(processorDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration processorDeclaration: processorDeclarations) {
+            Map<String, String> attributes = processorDeclaration.getAttributes();
             
             // Load a URL artifact processor
             String packageType = attributes.get("type");
             
             // Create a processor wrapper and register it
-            PackageProcessor processor = new LazyPackageProcessor(packageType, className);
+            PackageProcessor processor = new LazyPackageProcessor(packageType, processorDeclaration);
             addPackageProcessor(processor);
         }
         
@@ -91,12 +91,12 @@
      */
     private static class LazyPackageProcessor implements PackageProcessor {
         
-        private String className;
+        private ServiceDeclaration processorDeclaration;
         private String packageType;
         private PackageProcessor processor;
         
-        private LazyPackageProcessor(String packageType, String className) {
-            this.className = className;
+        private LazyPackageProcessor(String packageType, ServiceDeclaration processorDeclaration) {
+            this.processorDeclaration = processorDeclaration;
             this.packageType = packageType;
         }
 
@@ -116,8 +116,7 @@
         private PackageProcessor getProcessor() {
             if (processor == null) {
                 try {
-                    ClassLoader classLoader = PackageProcessor.class.getClassLoader();
-                    Class<PackageProcessor> processorClass = (Class<PackageProcessor>)Class.forName(className, true, classLoader);
+                    Class<PackageProcessor> processorClass = (Class<PackageProcessor>)processorDeclaration.loadClass();
                     Constructor<PackageProcessor> constructor = processorClass.getConstructor();
                     processor = constructor.newInstance();
                 } catch (Exception e) {

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -20,8 +20,8 @@
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -34,7 +34,8 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 
 /**
@@ -83,17 +84,15 @@
             return;
 
         // Get the processor service declarations
-        ClassLoader classLoader = StAXArtifactProcessor.class.getClassLoader();
-        List<String> processorDeclarations; 
+        Set<ServiceDeclaration> processorDeclarations; 
         try {
-            processorDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, StAXArtifactProcessor.class.getName());
+            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(StAXArtifactProcessor.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
-        for (String processorDeclaration: processorDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(processorDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration processorDeclaration: processorDeclarations) {
+            Map<String, String> attributes = processorDeclaration.getAttributes();
             
             // Load a StAX artifact processor
             
@@ -112,7 +111,7 @@
             String factoryName = attributes.get("factory");
             
             // Create a processor wrapper and register it
-            StAXArtifactProcessor processor = new LazyStAXArtifactProcessor(modelFactories, artifactType, modelTypeName, factoryName, className);
+            StAXArtifactProcessor processor = new LazyStAXArtifactProcessor(modelFactories, artifactType, modelTypeName, factoryName, processorDeclaration);
             addArtifactProcessor(processor);
         }
         
@@ -129,16 +128,21 @@
         private QName artifactType;
         private String modelTypeName;
         private String factoryName;
-        private String className;
+        private ServiceDeclaration processorDeclaration;
         private StAXArtifactProcessor processor;
         private Class modelType;
         
-        LazyStAXArtifactProcessor(ModelFactoryExtensionPoint modelFactories, QName artifactType, String modelTypeName, String factoryName, String className) {
+        LazyStAXArtifactProcessor(ModelFactoryExtensionPoint modelFactories, 
+        		QName artifactType, 
+        		String modelTypeName, 
+        		String factoryName, 
+        		ServiceDeclaration processorDeclaration) {
+        	
             this.modelFactories = modelFactories;
             this.artifactType = artifactType;
             this.modelTypeName = modelTypeName;
             this.factoryName = factoryName;
-            this.className = className;
+            this.processorDeclaration = processorDeclaration;
         }
 
         public QName getArtifactType() {
@@ -149,17 +153,16 @@
         private StAXArtifactProcessor getProcessor() {
             if (processor == null) {
 
-                if (className.equals("org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor")) {
+                if (processorDeclaration.getClassName().equals("org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor")) {
                     
                     // Specific initialization for the DefaultBeanModelProcessor
                     AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
                     PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
                     try {
-                        ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-                        Class<StAXArtifactProcessor> processorClass = (Class<StAXArtifactProcessor>)Class.forName(className, true, classLoader);
+                        Class<StAXArtifactProcessor> processorClass = (Class<StAXArtifactProcessor>)processorDeclaration.loadClass();
                         Object modelFactory;
                         if (factoryName != null) {
-                            Class<?> factoryClass = (Class<?>)Class.forName(factoryName, true, classLoader);
+                            Class<?> factoryClass = (Class<?>)processorDeclaration.loadClass(factoryName);
                             modelFactory = modelFactories.getFactory(factoryClass);
                         } else {
                             modelFactory = null;
@@ -173,8 +176,7 @@
                     
                     // Load and instanciate the processor class
                     try {
-                        ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-                        Class<StAXArtifactProcessor> processorClass = (Class<StAXArtifactProcessor>)Class.forName(className, true, classLoader);
+                        Class<StAXArtifactProcessor> processorClass = (Class<StAXArtifactProcessor>)processorDeclaration.loadClass();
                         Constructor<StAXArtifactProcessor> constructor = processorClass.getConstructor(ModelFactoryExtensionPoint.class);
                         processor = constructor.newInstance(modelFactories);
                     } catch (Exception e) {
@@ -197,8 +199,7 @@
         public Class getModelType() {
             if (modelType == null) {
                 try {
-                    ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-                    modelType = Class.forName(modelTypeName, true, classLoader);
+                    modelType = processorDeclaration.loadClass(modelTypeName);
                 } catch (Exception e) {
                     throw new IllegalStateException(e);
                 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -22,14 +22,15 @@
 import java.lang.reflect.Constructor;
 import java.net.URI;
 import java.net.URL;
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 /**
  * The default implementation of a StAX artifact processor registry.
@@ -77,24 +78,21 @@
             return;
 
         // Get the processor service declarations
-        ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-        List<String> processorDeclarations; 
+        Set<ServiceDeclaration> processorDeclarations; 
         try {
-            processorDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, URLArtifactProcessor.class.getName());
+            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(URLArtifactProcessor.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
-        for (String processorDeclaration: processorDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(processorDeclaration);
-            String className = attributes.get("class");
-            
+        for (ServiceDeclaration processorDeclaration: processorDeclarations) {
+            Map<String, String> attributes = processorDeclaration.getAttributes();
             // Load a URL artifact processor
             String artifactType = attributes.get("type");
             String modelTypeName = attributes.get("model");
             
             // Create a processor wrapper and register it
-            URLArtifactProcessor processor = new LazyURLArtifactProcessor(modelFactories, artifactType, modelTypeName, className);
+            URLArtifactProcessor processor = new LazyURLArtifactProcessor(modelFactories, artifactType, modelTypeName, processorDeclaration);
             addArtifactProcessor(processor);
         }
         
@@ -110,15 +108,18 @@
         private ModelFactoryExtensionPoint modelFactories;
         private String artifactType;
         private String modelTypeName;
-        private String className;
+        private ServiceDeclaration processorDeclaration;
         private URLArtifactProcessor processor;
         private Class modelType;
         
-        LazyURLArtifactProcessor(ModelFactoryExtensionPoint modelFactories, String artifactType, String modelTypeName, String className) {
+        LazyURLArtifactProcessor(ModelFactoryExtensionPoint modelFactories, 
+        		String artifactType, 
+        		String modelTypeName, 
+        		ServiceDeclaration processorDeclaration) {
             this.modelFactories = modelFactories;
             this.artifactType = artifactType;
             this.modelTypeName = modelTypeName;
-            this.className = className;
+            this.processorDeclaration = processorDeclaration;
         }
 
         public String getArtifactType() {
@@ -129,8 +130,7 @@
         private URLArtifactProcessor getProcessor() {
             if (processor == null) {
                 try {
-                    ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-                    Class<URLArtifactProcessor> processorClass = (Class<URLArtifactProcessor>)Class.forName(className, true, classLoader);
+                    Class<URLArtifactProcessor> processorClass = (Class<URLArtifactProcessor>)processorDeclaration.loadClass();
                     Constructor<URLArtifactProcessor> constructor = processorClass.getConstructor(ModelFactoryExtensionPoint.class);
                     processor = constructor.newInstance(modelFactories);
                 } catch (Exception e) {
@@ -147,8 +147,7 @@
         public Class getModelType() {
             if (modelType == null) {
                 try {
-                    ClassLoader classLoader = URLArtifactProcessor.class.getClassLoader();
-                    modelType = Class.forName(modelTypeName, true, classLoader);
+                    modelType = processorDeclaration.loadClass(modelTypeName);
                 } catch (Exception e) {
                     throw new IllegalStateException(e);
                 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -24,8 +24,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 /**
  * DefaultValidationSchemaExtensionPoint
@@ -54,19 +56,18 @@
             return;
 
         // Get the schema declarations
-        ClassLoader classLoader = ValidationSchemaExtensionPoint.class.getClassLoader();
-        List<String> schemaDeclarations; 
+        Set<ServiceDeclaration> schemaDeclarations; 
         try {
-            schemaDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, "org.apache.tuscany.sca.contribution.processor.ValidationSchema");
+            schemaDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations("org.apache.tuscany.sca.contribution.processor.ValidationSchema");
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
         // Find each schema
-        for (String schemaDeclaration: schemaDeclarations) {
-            URL url = classLoader.getResource(schemaDeclaration);
+        for (ServiceDeclaration schemaDeclaration: schemaDeclarations) {
+            URL url = schemaDeclaration.getResource();
             if (url == null) {
-                throw new IllegalArgumentException(new FileNotFoundException(schemaDeclaration));
+                throw new IllegalArgumentException(new FileNotFoundException(schemaDeclaration.getClassName()));
             }
             schemas.add(url.toString());
         }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -20,10 +20,12 @@
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
 
 /**
  * The default implementation of a model resolver Class registry.
@@ -33,7 +35,7 @@
 public class DefaultModelResolverExtensionPoint implements ModelResolverExtensionPoint {
     
     private final Map<Class<?>, Class<? extends ModelResolver>> resolvers = new HashMap<Class<?>, Class<? extends ModelResolver>>();
-    private Map<String, String> loadedResolvers;
+    private Map<String, ServiceDeclaration> loadedResolvers;
 
     /**
      * Constructs a new model resolver registry.
@@ -49,6 +51,7 @@
         resolvers.remove(modelType);
     }
 
+    @SuppressWarnings("unchecked")
     public Class<? extends ModelResolver> getResolver(Class<?> modelType) {
         loadModelResolvers();
         
@@ -56,10 +59,10 @@
         for (Class<?> c : classes) {
             Class<? extends ModelResolver> resolver = resolvers.get(c);
             if (resolver == null) {
-                String className = loadedResolvers.get(c.getName());
-                if (className != null) {
+                ServiceDeclaration resolverClass = loadedResolvers.get(c.getName());
+                if (resolverClass != null) {
                     try {
-                        return (Class<? extends ModelResolver>)Class.forName(className, true, modelType.getClassLoader());
+                        return (Class<? extends ModelResolver>)resolverClass.loadClass();
                     } catch (ClassNotFoundException e) {
                         throw new IllegalArgumentException(e);
                     }
@@ -71,10 +74,10 @@
 
         Class<? extends ModelResolver > resolver = resolvers.get(modelType);
         if (resolver == null) {
-            String className = loadedResolvers.get(modelType.getName());
-            if (className != null) {
+            ServiceDeclaration resolverClass = loadedResolvers.get(modelType.getName());
+            if (resolverClass != null) {
                 try {
-                    return (Class<? extends ModelResolver>)Class.forName(className, true, modelType.getClassLoader());
+                    return (Class<? extends ModelResolver>)resolverClass.loadClass();
                 } catch (ClassNotFoundException e) {
                     throw new IllegalArgumentException(e);
                 }
@@ -89,24 +92,22 @@
     private void loadModelResolvers() {
         if (loadedResolvers != null)
             return;
-        loadedResolvers = new HashMap<String, String>();
+        loadedResolvers = new HashMap<String, ServiceDeclaration>();
 
         // Get the model resolver service declarations
-        ClassLoader classLoader = ModelResolver.class.getClassLoader();
-        List<String> modelResolverDeclarations; 
+        Set<ServiceDeclaration> modelResolverDeclarations; 
         try {
-            modelResolverDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, ModelResolver.class.getName());
+            modelResolverDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ModelResolver.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
         // Load model resolvers
-        for (String dataBindingDeclaration: modelResolverDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(dataBindingDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration dataBindingDeclaration: modelResolverDeclarations) {
+            Map<String, String> attributes = dataBindingDeclaration.getAttributes();
             String model = attributes.get("model");
 
-            loadedResolvers.put(model, className);
+            loadedResolvers.put(model, dataBindingDeclaration);
         }
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -22,8 +22,10 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 /**
  * Default implementation of a contribution listener extension point.
@@ -51,24 +53,24 @@
     /**
      * Dynamically load listeners declared under META-INF/services
      */
+    @SuppressWarnings("unchecked")
     private void loadListeners() {
         if (loadedListeners)
             return;
 
         // Get the databinding service declarations
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        List<String> listenerDeclarations; 
+        Set<ServiceDeclaration> listenerDeclarations; 
         try {
-            listenerDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, ContributionListener.class.getName());
+            listenerDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ContributionListener.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
         
         // Load data bindings
-        for (String listenerDeclaration: listenerDeclarations) {
+        for (ServiceDeclaration listenerDeclaration: listenerDeclarations) {
             ContributionListener listener;
             try {
-                Class<ContributionListener> listenerClass = (Class<ContributionListener>)Class.forName(listenerDeclaration, true, classLoader);
+                Class<ContributionListener> listenerClass = (Class<ContributionListener>)listenerDeclaration.loadClass();
                 listener = listenerClass.newInstance();
             } catch (ClassNotFoundException e) {
                 throw new IllegalArgumentException(e);

Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDeclaration.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDeclaration.java?rev=591112&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDeclaration.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDeclaration.java Thu Nov  1 11:31:21 2007
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.util;
+
+import java.lang.ref.WeakReference;
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * Service declaration using J2SE Jar service provider spec
+ * Classes specified inside this declaration are loaded using the classloader
+ * used to read the configuration file corresponding to this declaration.
+ *
+ */
+public class ServiceDeclaration {
+	
+	private WeakReference<ClassLoader> classLoader;
+	
+	private String className;
+	
+	private Map<String, String> attributes;
+	
+	/**
+	 * Service declaration constructor
+	 * 
+	 * @param className   Service implementation classname
+	 * @param classLoader Classloader corresponding to this service implementation
+	 * @param attributes  Optional attributes for this service declaration
+	 */
+	public ServiceDeclaration(String className, 
+			ClassLoader classLoader,
+			Map<String, String> attributes) {
+		
+		this.className = className;
+		this.classLoader = new WeakReference<ClassLoader>(classLoader);
+		this.attributes = attributes;
+	}
+	
+	/**
+	 * Load this service implementation class
+	 * @return Class
+	 * @throws ClassNotFoundException
+	 */
+	@SuppressWarnings("unchecked")
+	public Class<?> loadClass() throws ClassNotFoundException {
+		
+		return Class.forName(className, true, classLoader.get());
+	}
+	
+
+	/**
+	 * Load another class using the classloader of this service implementation
+	 * 
+	 * @param anotherClassName
+	 * @return Class
+	 * @throws ClassNotFoundException
+	 */
+	public Class<?> loadClass(String anotherClassName) throws ClassNotFoundException {
+		
+		return Class.forName(anotherClassName, true, classLoader.get());
+	}
+	
+	/**
+	 * Return the resource corresponding to this service implementation class
+	 * @return resource URL
+	 */
+	public URL getResource() {
+		return classLoader.get().getResource(className);
+	}
+	
+	/**
+	 * Classloader associated with this service declaration
+	 * @return classloader 
+	 */
+	public ClassLoader getClassLoader() {
+		return classLoader.get();
+	}
+
+	/**
+	 * Service implementation class corresponding to this declaration
+	 * @return classname
+	 */
+	public String getClassName() {
+		return className;
+	}
+
+	/**
+	 * Attributes specified for this declaration
+	 * @return attributes
+	 */
+	public Map<String, String> getAttributes() {
+		return attributes;
+	}
+
+	/**
+	 * Equals method used to ensure that each service declaration is
+	 * stored only once in a set of declarations.
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (!(o instanceof ServiceDeclaration))
+			return false;
+		ServiceDeclaration s = (ServiceDeclaration)o;
+		if (!className.equals(s.className))
+			return false;
+		else if (!classLoader.equals(s.classLoader))
+			return false;
+		else if (attributes == null)
+		    return s.attributes == null;
+		else
+			return attributes.equals(s.attributes);
+		
+	}
+
+	
+	
+}

Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDiscovery.java?rev=591112&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDiscovery.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/util/ServiceDiscovery.java Thu Nov  1 11:31:21 2007
@@ -0,0 +1,252 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * 
+ * Service discovery for Tuscany based on J2SE Jar service provider spec.
+ * Services are described using configuration files in META-INF/services.
+ * Service description specifies a classname followed by optional properties.
+ * 
+ * Multi-classloader environments are supported through a classloader registration API
+ * 
+ */
+public class ServiceDiscovery {
+    private final static Logger logger = Logger.getLogger(ServiceDiscovery.class.getName());
+    
+    private static ServiceDiscovery instance;
+    
+    private HashSet<ClassLoader> registeredClassLoaders;
+    
+    /**
+     * Get an instance of Service discovery, one instance is created per 
+     * classloader that this class is loaded from
+     * 
+     * @return
+     */
+    public static ServiceDiscovery getInstance() {
+        
+        if (instance == null) {
+            instance = new ServiceDiscovery();
+            instance.registeredClassLoaders = new HashSet<ClassLoader>();
+            instance.registeredClassLoaders.add(ServiceDiscovery.class.getClassLoader());
+        }
+        return instance;
+    }
+
+    /**
+     * Register a classloader with this discovery mechanism. Tuscany
+     * extension classloaders are registered here.
+     * 
+     * @param classLoader
+     */
+    public void registerClassLoader(ClassLoader classLoader) {
+        registeredClassLoaders.add(classLoader);
+    }
+    
+
+    /**
+     * Get all service declarations for this name
+     * 
+     * @param name
+     * @return set of service declarations
+     * @throws IOException
+     */
+    public Set<ServiceDeclaration> getServiceDeclarations(String name) 
+        throws IOException {
+        
+        Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
+        
+        for (ClassLoader classLoader : registeredClassLoaders) {
+            getServiceClasses(classLoader, name, classSet, true);
+        }
+        return classSet;
+    }
+    
+    /**
+     * Get all service declarations for this interface
+     * 
+     * @param serviceInterface
+     * @return set of service declarations
+     * @throws IOException
+     */
+    public Set<ServiceDeclaration> getServiceDeclarations(Class<?> serviceInterface) 
+        throws IOException {
+    
+    	return getServiceDeclarations(serviceInterface.getName());
+    }
+
+    /**
+     * Load one service implementation class for this interface
+     * 
+     * @param serviceInterface
+     * @return service implementation class
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public  Class<?> loadFirstServiceClass(Class<?> serviceInterface)
+        throws IOException, ClassNotFoundException {
+    	
+    	 Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
+         
+         for (ClassLoader classLoader : registeredClassLoaders) {
+             getServiceClasses(classLoader, serviceInterface.getName(), classSet, false);
+             if (classSet.size() > 0)
+            	 break;
+         }
+         if (classSet.size() > 0)
+        	 return classSet.iterator().next().loadClass();
+         else
+        	 return null;
+    
+    }
+    
+    /**
+     * Returns a unique list of resource URLs of name META-INF/services/<name>
+     * Each URL is associated with the first classloader that it was visible from
+     * 
+     * @param name Name of resource
+     * @return Table of URLs with associated classloaders
+     * @throws IOException
+     */
+    public Hashtable<ClassLoader, Set<URL>> getServiceResources(String name) throws IOException {
+    	
+    	Hashtable<ClassLoader, Set<URL>> resourceTable = new Hashtable<ClassLoader, Set<URL>>();
+    	
+    	HashSet<URL> allURLs = new HashSet<URL>();
+    	for (ClassLoader classLoader : registeredClassLoaders) {
+    		HashSet<URL> urls = new HashSet<URL>();
+    		resourceTable.put(classLoader, urls);
+    		boolean debug = logger.isLoggable(Level.FINE);
+            if (debug) {
+                logger.fine("Discovering service resources using class loader " + classLoader);
+            }
+            for (URL url : Collections.list(classLoader.getResources("META-INF/services/" + name))) {
+                if (allURLs.contains(url))
+                	continue;
+                urls.add(url);
+            }
+            allURLs.addAll(urls);
+    	}
+    	return resourceTable;
+    }
+
+    /**
+     * Parse a service declaration in the form class;attr=value,attr=value and
+     * return a map of attributes
+     * 
+     * @param declaration
+     * @return a map of attributes
+     */
+    private Map<String, String> parseServiceDeclaration(String declaration) {
+        Map<String, String> attributes = new HashMap<String, String>();
+        StringTokenizer tokens = new StringTokenizer(declaration);
+        String className = tokens.nextToken(";");
+        if (className != null)
+            attributes.put("class", className);
+        for (; tokens.hasMoreTokens();) {
+            String key = tokens.nextToken("=").substring(1);
+            if (key == null)
+                break;
+            String value = tokens.nextToken(",").substring(1);
+            if (value == null)
+                break;
+            attributes.put(key, value);
+        }
+        return attributes;
+    }
+
+    /**
+     * Load the service class whose name specified in a configuration file
+     * 
+     * @param classLoader
+     * @param name The name of the service class
+     * @param classSet Populate this set with classes extends/implements the service class 
+     * @throws IOException
+     */
+    private void getServiceClasses(ClassLoader classLoader, 
+    		String name, 
+    		Set<ServiceDeclaration> classSet,
+    		boolean findAllClasses) 
+        throws IOException {
+        
+        boolean debug = logger.isLoggable(Level.FINE);
+        if (debug) {
+            logger.fine("Discovering service providers using class loader " + classLoader);
+        }
+        for (URL url : Collections.list(classLoader.getResources("META-INF/services/" + name))) {
+            if (debug) {
+                logger.fine("Reading service provider file: " + url.toExternalForm());
+            }
+            InputStream is = url.openStream();
+            BufferedReader reader = null;
+            try {
+                reader = new BufferedReader(new InputStreamReader(is));
+                while (true) {
+                    String line = reader.readLine();
+                    if (line == null)
+                        break;
+                    line = line.trim();
+                    if (!line.startsWith("#") && !"".equals(line)) {
+                        String reg = line.trim();
+                        if (debug) {
+                            logger.fine("Registering service provider: " + reg);
+                        }
+                        
+                        Map<String, String> attributes = parseServiceDeclaration(reg);
+                        String className = attributes.get("class");
+                        ServiceDeclaration serviceClass = new ServiceDeclaration(className, classLoader, attributes);
+                        classSet.add(serviceClass);
+                        
+                        if (!findAllClasses) break;
+                    }
+                }
+            } finally {
+                if (reader != null)
+                    reader.close();
+                if (is != null) {
+                    try {
+                        is.close();
+                    } catch (IOException ioe) {
+                    }
+                }
+            }
+            if (!findAllClasses && classSet.size() > 0) break;
+        }
+    }
+    
+    
+    
+}

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java Thu Nov  1 11:31:21 2007
@@ -25,12 +25,11 @@
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 
 /**
  * Default implementation of a registry to hold all the Tuscany core extension
@@ -66,16 +65,11 @@
         Object extensionPoint = extensionPoints.get(extensionPointType);
         if (extensionPoint == null) {
             
-            // Dynamically load an extension point class declared under META-INF/services 
-            ClassLoader classLoader = extensionPointType.getClassLoader();
-            if (classLoader == null) {
-                classLoader = Thread.currentThread().getContextClassLoader();
-            }
+            // Dynamically load an extension point class declared under META-INF/services           
             try {
-                List<String> classNames = ServiceConfigurationUtil.getServiceClassNames(classLoader, extensionPointType.getName());
-                if (!classNames.isEmpty()) {
-                    Class<?> extensionPointClass = Class.forName(classNames.iterator().next(), true, classLoader);
-                    
+                Class<?> extensionPointClass = 
+                	ServiceDiscovery.getInstance().loadFirstServiceClass(extensionPointType);
+                if (extensionPointClass != null) {
                     // Construct the extension point
                     try {
                         Constructor constructor = extensionPointClass.getConstructor();

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -19,16 +19,17 @@
 
 package org.apache.tuscany.sca.provider;
 
-import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -112,11 +113,11 @@
     private List<ProviderFactory> loadProviderFactories(Class<?> factoryClass) {
 
         // Get the provider factory service declarations
-        List<String> factoryDeclarations; 
+        Set<ServiceDeclaration> factoryDeclarations; 
+        ServiceDiscovery serviceDiscovery = ServiceDiscovery.getInstance();
         try {
-            ClassLoader classLoader = factoryClass.getClassLoader();
-            factoryDeclarations = ServiceConfigurationUtil.getServiceClassNames(classLoader, factoryClass.getName());
-        } catch (IOException e) {
+            factoryDeclarations = serviceDiscovery.getServiceDeclarations(factoryClass);
+        } catch (Exception e) {
             throw new IllegalStateException(e);
         }
         
@@ -124,16 +125,15 @@
         ProviderFactoryExtensionPoint factoryExtensionPoint = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
         List<ProviderFactory> factories = new ArrayList<ProviderFactory>();
         
-        for (String factoryDeclaration: factoryDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(factoryDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration factoryDeclaration: factoryDeclarations) {
+            Map<String, String> attributes = factoryDeclaration.getAttributes();
             
             // Load an implementation provider factory
             if (factoryClass == ImplementationProviderFactory.class) {
                 String modelTypeName = attributes.get("model");
                 
                 // Create a provider factory wrapper and register it
-                ImplementationProviderFactory factory = new LazyImplementationProviderFactory(registry, modelTypeName, className);
+                ImplementationProviderFactory factory = new LazyImplementationProviderFactory(registry, modelTypeName, factoryDeclaration);
                 factoryExtensionPoint.addProviderFactory(factory);
                 factories.add(factory);
 
@@ -143,7 +143,7 @@
                 String modelTypeName = attributes.get("model");
                 
                 // Create a provider factory wrapper and register it
-                BindingProviderFactory factory = new LazyBindingProviderFactory(registry, modelTypeName, className);
+                BindingProviderFactory factory = new LazyBindingProviderFactory(registry, modelTypeName, factoryDeclaration);
                 factoryExtensionPoint.addProviderFactory(factory);
                 factories.add(factory);
             }
@@ -159,22 +159,23 @@
 
         private ExtensionPointRegistry registry;
         private String modelTypeName;
-        private String className;
+        private ServiceDeclaration factoryDeclaration;
         private BindingProviderFactory factory;
         private Class modelType;
         
-        private LazyBindingProviderFactory(ExtensionPointRegistry registry, String modelTypeName, String className) {
+        private LazyBindingProviderFactory(ExtensionPointRegistry registry, 
+        		String modelTypeName, 
+        		ServiceDeclaration factoryDeclaration) {
             this.registry = registry;
             this.modelTypeName = modelTypeName;
-            this.className = className;
+            this.factoryDeclaration = factoryDeclaration;
         }
 
         @SuppressWarnings("unchecked")
         private BindingProviderFactory getFactory() {
             if (factory == null) {
                 try {
-                    ClassLoader classLoader = BindingProviderFactory.class.getClassLoader();
-                    Class<BindingProviderFactory> factoryClass = (Class<BindingProviderFactory>)Class.forName(className, true, classLoader);
+                    Class<BindingProviderFactory> factoryClass = (Class<BindingProviderFactory>)factoryDeclaration.loadClass();
                     Constructor<BindingProviderFactory> constructor = factoryClass.getConstructor(ExtensionPointRegistry.class);
                     factory = constructor.newInstance(registry);
                 } catch (Exception e) {
@@ -197,8 +198,7 @@
         public Class getModelType() {
             if (modelType == null) {
                 try {
-                    ClassLoader classLoader = BindingProviderFactory.class.getClassLoader();
-                    modelType = Class.forName(modelTypeName, true, classLoader);
+                	modelType = factoryDeclaration.loadClass(modelTypeName);
                 } catch (Exception e) {
                     throw new IllegalStateException(e);
                 }
@@ -216,22 +216,21 @@
 
         private ExtensionPointRegistry registry;
         private String modelTypeName;
-        private String className;
+        private ServiceDeclaration providerClass;
         private ImplementationProviderFactory factory;
         private Class modelType;
         
-        private LazyImplementationProviderFactory(ExtensionPointRegistry registry, String modelTypeName, String className) {
+        private LazyImplementationProviderFactory(ExtensionPointRegistry registry, String modelTypeName, ServiceDeclaration providerClass) {
             this.registry = registry;
             this.modelTypeName = modelTypeName;
-            this.className = className;
+            this.providerClass = providerClass;
         }
 
         @SuppressWarnings("unchecked")
         private ImplementationProviderFactory getFactory() {
             if (factory == null) {
                 try {
-                    ClassLoader classLoader = ImplementationProviderFactory.class.getClassLoader();
-                    Class<ImplementationProviderFactory> factoryClass = (Class<ImplementationProviderFactory>)Class.forName(className, true, classLoader);
+                    Class<ImplementationProviderFactory> factoryClass = (Class<ImplementationProviderFactory>)providerClass.loadClass();
                     Constructor<ImplementationProviderFactory> constructor = factoryClass.getConstructor(ExtensionPointRegistry.class);
                     factory = constructor.newInstance(registry);
                 } catch (Exception e) {
@@ -249,8 +248,8 @@
         public Class getModelType() {
             if (modelType == null) {
                 try {
-                    ClassLoader classLoader = ImplementationProviderFactory.class.getClassLoader();
-                    modelType = Class.forName(modelTypeName, true, classLoader);
+                    
+                    modelType = providerClass.loadClass(modelTypeName);
                 } catch (Exception e) {
                     throw new IllegalStateException(e);
                 }

Added: incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler?rev=591112&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler (added)
+++ incubator/tuscany/java/sca/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler Thu Nov  1 11:31:21 2007
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+org.apache.tuscany.sca.core.work.Jsr237WorkScheduler

Modified: incubator/tuscany/java/sca/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/pom.xml?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding/pom.xml Thu Nov  1 11:31:21 2007
@@ -36,6 +36,12 @@
 		</dependency>
 
 		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-contribution</artifactId>
+			<version>1.1-incubating-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
 			<groupId>stax</groupId>
 			<artifactId>stax-api</artifactId>
 			<version>1.0.1</version>

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -20,16 +20,17 @@
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.tuscany.sca.databinding.impl.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
 import org.apache.tuscany.sca.interfacedef.DataType;
 import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
@@ -61,17 +62,19 @@
     }
 
     public void addDataBinding(DataBinding dataBinding) {
-        if (logger.isLoggable(Level.FINE)) {
-            String className = dataBinding.getClass().getName();
-            boolean lazy = false;
-            if (dataBinding instanceof LazyDataBinding) {
-                className = ((LazyDataBinding)dataBinding).className;
-                lazy = true;
-            }
-            logger.fine("Adding databinding: " + className + ";type=" + dataBinding.getName() + ",lazy=" + lazy);
-        }
+    	if (logger.isLoggable(Level.FINE)) {
+			String className = dataBinding.getClass().getName();
+			boolean lazy = false;
+			if (dataBinding instanceof LazyDataBinding) {
+				className = ((LazyDataBinding) dataBinding).dataBindingDeclaration.getClassName();
+				lazy = true;
+			}
+			logger.fine("Adding databinding: " + className + ";type="
+					+ dataBinding.getName() + ",lazy=" + lazy);
+		}
         databindings.add(dataBinding);
-        bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
+		bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
+
         String[] aliases = dataBinding.getAliases();
         if (aliases != null) {
             for (String alias : aliases) {
@@ -105,24 +108,22 @@
             return;
 
         // Get the databinding service declarations
-        ClassLoader classLoader = DataBinding.class.getClassLoader();
-        List<String> dataBindingDeclarations;
+        Set<ServiceDeclaration> dataBindingDeclarations;
         try {
             dataBindingDeclarations =
-                ServiceConfigurationUtil.getServiceClassNames(classLoader, DataBinding.class.getName());
+                ServiceDiscovery.getInstance().getServiceDeclarations(DataBinding.class);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
 
         // Load data bindings
-        for (String dataBindingDeclaration : dataBindingDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(dataBindingDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration dataBindingDeclaration : dataBindingDeclarations) {
+            Map<String, String> attributes = dataBindingDeclaration.getAttributes();
             String type = attributes.get("type");
             String name = attributes.get("name");
 
             // Create a data binding wrapper and register it
-            DataBinding dataBinding = new LazyDataBinding(type, name, classLoader, className);
+            DataBinding dataBinding = new LazyDataBinding(type, name, dataBindingDeclaration);
             addDataBinding(dataBinding);
         }
 
@@ -137,17 +138,15 @@
 
         private String name;
         private String[] aliases;
-        private WeakReference<ClassLoader> classLoader;
-        private String className;
+        private ServiceDeclaration dataBindingDeclaration;
         private DataBinding dataBinding;
 
-        private LazyDataBinding(String type, String name, ClassLoader classLoader, String className) {
+        private LazyDataBinding(String type, String name, ServiceDeclaration dataBindingDeclaration) {
             this.name = type;
             if (name != null) {
                 this.aliases = new String[] {name};
             }
-            this.classLoader = new WeakReference<ClassLoader>(classLoader);
-            this.className = className;
+            this.dataBindingDeclaration = dataBindingDeclaration;
         }
 
         /**
@@ -160,7 +159,7 @@
             if (dataBinding == null) {
                 try {
                     Class<DataBinding> dataBindingClass =
-                        (Class<DataBinding>)Class.forName(className, true, classLoader.get());
+                        (Class<DataBinding>)dataBindingDeclaration.loadClass();
                     Constructor<DataBinding> constructor = dataBindingClass.getConstructor();
                     dataBinding = constructor.newInstance();
                 } catch (Exception e) {

Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java Thu Nov  1 11:31:21 2007
@@ -19,16 +19,17 @@
 package org.apache.tuscany.sca.databinding;
 
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.databinding.impl.DirectedGraph;
-import org.apache.tuscany.sca.databinding.impl.ServiceConfigurationUtil;
 
 /**
  * @version $Rev$ $Date$
@@ -43,18 +44,18 @@
     }
 
     public void addTransformer(String sourceType, String resultType, int weight, Transformer transformer) {
-        if (logger.isLoggable(Level.FINE)) {
-            String className = transformer.getClass().getName();
-            boolean lazy = false;
-            boolean pull = (transformer instanceof PullTransformer);
-            if (transformer instanceof LazyPullTransformer) {
-                className = ((LazyPullTransformer)transformer).className;
-                lazy = true;
-            }
-            if (transformer instanceof LazyPushTransformer) {
-                className = ((LazyPushTransformer)transformer).className;
-                lazy = true;
-            }
+    	if (logger.isLoggable(Level.FINE)) {
+			String className = transformer.getClass().getName();
+			boolean lazy = false;
+			boolean pull = (transformer instanceof PullTransformer);
+			if (transformer instanceof LazyPullTransformer) {
+				className = ((LazyPullTransformer) transformer).transformerDeclaration.getClassName();
+				lazy = true;
+			}
+			if (transformer instanceof LazyPushTransformer) {
+				className = ((LazyPushTransformer) transformer).transformerDeclaration.getClassName();
+				lazy = true;
+			}
 
             logger.fine("Adding transformer: " + className
                 + ";source="
@@ -110,19 +111,19 @@
     private void loadTransformers(Class<?> transformerClass) {
 
         // Get the transformer service declarations
-        ClassLoader classLoader = transformerClass.getClassLoader();
-        List<String> transformerDeclarations;
+        Set<ServiceDeclaration> transformerDeclarations; 
+
         try {
-            transformerDeclarations =
-                ServiceConfigurationUtil.getServiceClassNames(classLoader, transformerClass.getName());
+            transformerDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(transformerClass);
+
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
 
         // Load transformers
-        for (String transformerDeclaration : transformerDeclarations) {
-            Map<String, String> attributes = ServiceConfigurationUtil.parseServiceDeclaration(transformerDeclaration);
-            String className = attributes.get("class");
+        for (ServiceDeclaration transformerDeclaration: transformerDeclarations) {
+            Map<String, String> attributes = transformerDeclaration.getAttributes();
+
             String source = attributes.get("source");
             String target = attributes.get("target");
             int weight = Integer.valueOf(attributes.get("weight"));
@@ -130,9 +131,9 @@
             // Create a transformer wrapper and register it
             Transformer transformer;
             if (transformerClass == PullTransformer.class) {
-                transformer = new LazyPullTransformer(source, target, weight, classLoader, className);
+                transformer = new LazyPullTransformer(source, target, weight, transformerDeclaration);
             } else {
-                transformer = new LazyPushTransformer(source, target, weight, classLoader, className);
+                transformer = new LazyPushTransformer(source, target, weight, transformerDeclaration);
             }
             addTransformer(transformer);
         }
@@ -147,16 +148,14 @@
         private String source;
         private String target;
         private int weight;
-        private WeakReference<ClassLoader> classLoader;
-        private String className;
+        private ServiceDeclaration transformerDeclaration;
         private PullTransformer<Object, Object> transformer;
 
-        public LazyPullTransformer(String source, String target, int weight, ClassLoader classLoader, String className) {
+        public LazyPullTransformer(String source, String target, int weight, ServiceDeclaration transformerDeclaration) {
             this.source = source;
             this.target = target;
             this.weight = weight;
-            this.classLoader = new WeakReference<ClassLoader>(classLoader);
-            this.className = className;
+            this.transformerDeclaration = transformerDeclaration;
         }
 
         /**
@@ -169,7 +168,7 @@
             if (transformer == null) {
                 try {
                     Class<PullTransformer<Object, Object>> transformerClass =
-                        (Class<PullTransformer<Object, Object>>)Class.forName(className, true, classLoader.get());
+                        (Class<PullTransformer<Object, Object>>)transformerDeclaration.loadClass();
                     Constructor<PullTransformer<Object, Object>> constructor = transformerClass.getConstructor();
                     transformer = constructor.newInstance();
                 } catch (Exception e) {
@@ -197,7 +196,7 @@
 
         public String toString() {
             StringBuffer sb = new StringBuffer(super.toString());
-            sb.append(";className=").append(className);
+            sb.append(";className=").append(transformerDeclaration.getClassName());
             return sb.toString();
         }
     }
@@ -211,16 +210,14 @@
         private String source;
         private String target;
         private int weight;
-        private WeakReference<ClassLoader> classLoader;
-        private String className;
+        private ServiceDeclaration transformerDeclaration;
         private PushTransformer<Object, Object> transformer;
 
-        public LazyPushTransformer(String source, String target, int weight, ClassLoader classLoader, String className) {
+        public LazyPushTransformer(String source, String target, int weight, ServiceDeclaration transformerDeclaration) {
             this.source = source;
             this.target = target;
             this.weight = weight;
-            this.classLoader = new WeakReference<ClassLoader>(classLoader);
-            this.className = className;
+            this.transformerDeclaration = transformerDeclaration;
         }
 
         /**
@@ -233,7 +230,7 @@
             if (transformer == null) {
                 try {
                     Class<PushTransformer<Object, Object>> transformerClass =
-                        (Class<PushTransformer<Object, Object>>)Class.forName(className, true, classLoader.get());
+                        (Class<PushTransformer<Object, Object>>)transformerDeclaration.loadClass();
                     Constructor<PushTransformer<Object, Object>> constructor = transformerClass.getConstructor();
                     transformer = constructor.newInstance();
                 } catch (Exception e) {
@@ -261,7 +258,7 @@
 
         public String toString() {
             StringBuffer sb = new StringBuffer(super.toString());
-            sb.append(";className=").append(className);
+            sb.append(";className=").append(transformerDeclaration.getClassName());
             return sb.toString();
         }
     }

Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java Thu Nov  1 11:31:21 2007
@@ -61,10 +61,9 @@
         ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
         this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
 
-        //FIXME The classloader should be passed in
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
         this.bindingActivators =
-            DiscoveryUtils.discoverActivators(BindingActivator.class, classLoader, registry);
+            DiscoveryUtils.discoverActivators(BindingActivator.class, registry);
 
         StAXArtifactProcessorExtensionPoint staxProcessors =
             registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java Thu Nov  1 11:31:21 2007
@@ -19,19 +19,15 @@
 
 package org.apache.tuscany.sca.extension.helper.impl;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 
 /**
@@ -40,16 +36,23 @@
  */
 public class DiscoveryUtils {
 
-    public static <T> List<T> discoverActivators(Class<T> activatorClass, ClassLoader classLoader, ExtensionPointRegistry registry) {
-        Set<Class> activatorClasses = getServiceClasses(classLoader, activatorClass);
-        List<T> activators = new ArrayList<T>();
-        for (Class<T> c : activatorClasses) {
-            try {
-                activators.add(c.cast(instantiateActivator(c, registry)));
-            } catch (Throwable e) {
-                e.printStackTrace(); // TODO: log
-            }
-        }
+	@SuppressWarnings("unchecked")
+    public static <T> List<T> discoverActivators(Class<T> activatorClass, ExtensionPointRegistry registry) {
+        List<T> activators;
+		try {
+			Set<ServiceDeclaration> activatorClasses = ServiceDiscovery.getInstance().getServiceDeclarations(activatorClass);
+			activators = new ArrayList<T>();
+			for (ServiceDeclaration declaration : activatorClasses) {
+			    try {
+			    	Class<T> c = (Class<T>)declaration.loadClass();
+			        activators.add(c.cast(instantiateActivator(c, registry)));
+			    } catch (Throwable e) {
+			        e.printStackTrace(); // TODO: log
+			    }
+			}
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
         return activators;
     }
 
@@ -104,61 +107,5 @@
         }
     }
 
-    static Set<Class> getServiceClasses(ClassLoader classLoader, Class name) {
-        try {
-
-            Set<Class> set = new HashSet<Class>();
-            Enumeration<URL> urls = classLoader.getResources("META-INF/services/" + name.getName());
-            while (urls.hasMoreElements()) {
-                URL url = urls.nextElement();
-                Set<String> services = getServiceClassNames(url);
-                if (services != null) {
-                    for (String className : services) {
-                        try {
-                            set.add(Class.forName(className, true, classLoader));
-                        } catch (Throwable e) {
-                            // TODO: log 
-                        }
-                    }
-                }
-            }
-            return set;
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    static Set<String> getServiceClassNames(URL url) throws IOException {
-        Set<String> names = new HashSet<String>();
-        InputStream is = url.openStream();
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(is));
-            while (true) {
-                String line = reader.readLine();
-                if (line == null) {
-                    break;
-                }
-                line = line.trim();
-                if (!line.startsWith("#") && !"".equals(line)) {
-                    names.add(line.trim());
-                }
-            }
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-            
-            if (is != null){
-                try {
-                    is.close();
-                } catch( IOException ioe) {
-                    //ignore
-                }
-            }
-        }
-        return names;
-    }
 
 }

Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java Thu Nov  1 11:31:21 2007
@@ -62,9 +62,7 @@
         PropertyValueObjectFactory propertyFactory = new DefaultPropertyValueObjectFactory(mediator);
         registry.addExtensionPoint(propertyFactory);
 
-        // FIXME The classloader should be passed in
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        this.implementationActivators = DiscoveryUtils.discoverActivators(ImplementationActivator.class, classLoader, registry);
+        this.implementationActivators = DiscoveryUtils.discoverActivators(ImplementationActivator.class, registry);
 
         StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?rev=591112&r1=591111&r2=591112&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Thu Nov  1 11:31:21 2007
@@ -23,6 +23,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,7 +38,8 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.util.ServiceConfigurationUtil;
+import org.apache.tuscany.sca.contribution.util.ServiceDeclaration;
+import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ModuleActivator;
@@ -136,7 +138,7 @@
 
         
         // Load the runtime modules
-        modules = loadModules(registry, classLoader);
+        modules = loadModules(registry);
         
         // Start the runtime modules
         startModules(registry, modules);
@@ -222,14 +224,15 @@
     }
 
     @SuppressWarnings("unchecked")
-    private List<ModuleActivator> loadModules(ExtensionPointRegistry registry, ClassLoader classLoader) throws ActivationException {
+    private List<ModuleActivator> loadModules(ExtensionPointRegistry registry) throws ActivationException {
 
-        // Load and instantiate the modules found on the classpath
+        // Load and instantiate the modules found on the classpath (or any registered classloaders)
         modules = new ArrayList<ModuleActivator>();
         try {
-            List<String> classNames = ServiceConfigurationUtil.getServiceClassNames(classLoader, ModuleActivator.class.getName());
-            for (String className : classNames) {       
-                Class moduleClass = Class.forName(className, true, classLoader);
+        	Set<ServiceDeclaration> moduleActivators = ServiceDiscovery.getInstance().getServiceDeclarations(ModuleActivator.class);
+        	
+            for (ServiceDeclaration moduleDeclarator : moduleActivators) { 
+            	Class<?> moduleClass = moduleDeclarator.loadClass();
                 ModuleActivator module = (ModuleActivator)moduleClass.newInstance();
                 modules.add(module);
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org