Fixes to get the Equinox integration working. Use the parent classloader instead of the Thread context classloader as parent of the contribution classloader. Use the ServiceDiscovery to get instances of DocumentBuilderFactory and TransformerFactory. Pass these factories around instead of creating new instances in different places. Clarified the few prints in the calculator-osgi sample showing which classloader is used.

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

2 files changed, 2 insertions, 3 deletions

diff --git a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index 4e28301c25..a7dcba8f5e 100644
--- a/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/java/sca/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
@@ -42,8 +42,7 @@ public class CalculatorClient {
     public void calculate() {
 
         // Calculate
-        System.out.println(getClass().getClassLoader());
-        System.out.println(Reference.class.getClassLoader());
+        System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader());
         System.out.println("3 + 2=" + calculatorService.add(3, 2));
         System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
         System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
diff --git a/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index 0561370d3a..dc0da7d20d 100644
--- a/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/java/sca/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
@@ -39,7 +39,7 @@ public class CalculatorTestCase extends TestCase {
     protected void setUp() throws Exception {
         launcher = NodeLauncher.newInstance();
         node = launcher.createNodeFromClassLoader("Calculator.composite", getClass().getClassLoader());
-        System.out.println(node.getClass().getClassLoader());
+        System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
         node.start();
     }