svn commit: r693008 - in /tuscany/java/sca/modules/node-api: pom.xml src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java

[rf...@apache.org]

Author: rfeng
Date: Mon Sep  8 00:40:54 2008
New Revision: 693008

URL: http://svn.apache.org/viewvc?rev=693008&view=rev
Log:
Use the owning classloader instead of TCCL

Modified:
    tuscany/java/sca/modules/node-api/pom.xml
    tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java

Modified: tuscany/java/sca/modules/node-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/pom.xml?rev=693008&r1=693007&r2=693008&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-api/pom.xml (original)
+++ tuscany/java/sca/modules/node-api/pom.xml Mon Sep  8 00:40:54 2008
@@ -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>

Modified: tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java?rev=693008&r1=693007&r2=693008&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java (original)
+++ tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java Mon Sep  8 00:40:54 2008
@@ -120,11 +120,11 @@
         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 @@
             // 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;