TUSCANY-2972 instigate contribution type specific class loading to allow the JEE classloader to be used independently of jar, zip, dir classloading schemes

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@767015 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JEEClassLoaderProvider.java b/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
index 73745fccef..5ea7dc55f7 100644
--- a/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JEEClassLoaderProvider.java
+++ b/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
@@ -20,6 +20,7 @@
 package org.apache.tuscany.sca.contribution.jee.impl;
 
 import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.PackageType;
 import org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider;
 import org.apache.tuscany.sca.contribution.java.impl.ContributionClassLoader;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -27,15 +28,22 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 /**
  * The default implementation of the ContributionClassLoaderProvider
  */
-public class JEEClassLoaderProvider implements ContributionClassLoaderProvider {
+public class EARContributionClassLoaderProvider implements ContributionClassLoaderProvider {
 
-    public JEEClassLoaderProvider(ExtensionPointRegistry registry) {
+    public EARContributionClassLoaderProvider() {
         super();
     }
+    
+    public String getContributionType() {
+        return PackageType.EAR;
+    }
 
     public ClassLoader getClassLoader(Contribution contribution, ClassLoader parent) {
+        // TODO - This is not quite right at the CCL will load up the nested jars
+        //        also. However we do need to pick up the import processing so 
+        //        need a bit of a refactor
         ContributionClassLoader ccl = new ContributionClassLoader(contribution, parent);
-        return new JEEClassLoader(contribution, ccl);
+        return new EARContributionClassLoader(contribution, ccl);
     }
 
 }