diff options
Diffstat (limited to '')
3 files changed, 2 insertions, 34 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 bfcab602e1..4e28301c25 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 @@ -43,6 +43,7 @@ public class CalculatorClient { // Calculate System.out.println(getClass().getClassLoader()); + System.out.println(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/main/resources/CalculatorTest.composite b/java/sca/samples/calculator-osgi/src/main/resources/CalculatorTest.composite deleted file mode 100644 index 906e2a3918..0000000000 --- a/java/sca/samples/calculator-osgi/src/main/resources/CalculatorTest.composite +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="CalculatorTest"> - - <include name="sample:Calculator"/> - - <component name="CalculatorTestCase"> - <implementation.java class="calculator.CalculatorTestCase"/> - <reference name="calculatorService" target="CalculatorServiceComponent" /> - </component> - -</composite> 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 48489143f0..0561370d3a 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 @@ -23,8 +23,6 @@ import junit.framework.TestCase; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; import org.osoa.sca.annotations.EagerInit; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope; /** @@ -41,6 +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()); node.start(); } |