Use the owning classloader instead of TCCL

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

2 files changed, 4 insertions, 4 deletions

diff --git a/java/sca/modules/node-api/pom.xml b/java/sca/modules/node-api/pom.xml
index 14028e8790..02210daa88 100644
--- a/java/sca/modules/node-api/pom.xml
+++ b/java/sca/modules/node-api/pom.xml
@@ -51,7 +51,7 @@
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.api</Bundle-SymbolicName>

                         <Bundle-Description>${pom.name}</Bundle-Description>

                         <Export-Package>org.apache.tuscany.sca.node*</Export-Package>

-                        <DynamicImport-Package>org.apache.tuscany.sca.node.impl</DynamicImport-Package>

+                        <DynamicImport-Package>org.apache.tuscany.sca.node.impl,org.apache.tuscany.sca.extensibility</DynamicImport-Package>

                     </instructions>

                 </configuration>

             </plugin>

diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index 6d02d654e2..e41afd29c4 100644
--- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
@@ -120,11 +120,11 @@ public abstract class SCANodeFactory {
         SCANodeFactory scaNodeFactory = null;
 
         try {
-            final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            // final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             // Use reflection APIs to call ServiceDiscovery to avoid hard dependency to tuscany-extensibility
             try {
                 Class<?> discoveryClass =
-                    Class.forName("org.apache.tuscany.sca.extensibility.ServiceDiscovery", true, classLoader);
+                    Class.forName("org.apache.tuscany.sca.extensibility.ServiceDiscovery");
                 Object instance = discoveryClass.getMethod("getInstance").invoke(null);
                 Class<?> factoryImplClass =
                     (Class<?>)discoveryClass.getMethod("loadFirstServiceClass", Class.class)
@@ -140,7 +140,7 @@ public abstract class SCANodeFactory {
             // Fail back to default impl
             String className = "org.apache.tuscany.sca.node.impl.NodeFactoryImpl";
 
-            Class<?> cls = Class.forName(className, true, classLoader);
+            Class<?> cls = Class.forName(className);
             scaNodeFactory = (SCANodeFactory)cls.newInstance();
             return scaNodeFactory;