From 017e717836c919cd9cc6250f37bf08093ac42cdc Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 13 Jul 2010 10:20:40 +0000 Subject: Changes to get the test running in my environment git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@963660 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/calculator/Calculate.java | 6 ------ .../src/main/java/calculator/CalculatorService.java | 3 +-- .../src/main/java/launcher/SampleJSELauncher.java | 6 +++--- .../src/test/java/launcher/LauncherTestCase.java | 20 +++----------------- .../src/main/resources/Calculator.composite | 1 - 5 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java (limited to 'sca-java-2.x') diff --git a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java deleted file mode 100644 index 2f75ea7100..0000000000 --- a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java +++ /dev/null @@ -1,6 +0,0 @@ -package calculator; - -public interface Calculate { - String factors(); - -} diff --git a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java index f8f9c40bcb..9937323993 100644 --- a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java +++ b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java @@ -27,6 +27,5 @@ import org.oasisopen.sca.annotation.Remotable; @Remotable public interface CalculatorService { - String factors(Integer i); - + String calculate(Integer n1); } \ No newline at end of file diff --git a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java index 52fa8e39e4..20bd1a200c 100644 --- a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java +++ b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java @@ -48,7 +48,7 @@ public class SampleJSELauncher extends RuntimeIntegration { SampleJSELauncher launcher = new SampleJSELauncher(waitBeforeStopping); - launcher.launchBindingSCACalculator(); + launcher.launchImplementationJavaCalculatorAsync(); } @@ -75,8 +75,8 @@ public class SampleJSELauncher extends RuntimeIntegration { * The contribution-binding-sca-calculator contribution includes a client component * that calls the CalculatorServiceComponent from an operation marked by @Init. */ - public void launchBindingSCACalculator(){ - Node node = startNode(new Contribution("c1", "file://C:/Dev7/SCA/samples/my-contribution/target/my--sample-contribution-implementation-java-calculator.jar")); + public void launchImplementationJavaCalculatorAsync(){ + Node node = startNode(new Contribution("c1", "../sample-contribution-implementation-java-calculator-async/target/sample-contribution-implementation-java-calculator-async.jar")); waitBeforeStopping(); stopNode(node); } diff --git a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java index 2a6222f2ab..538b693e3c 100644 --- a/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java +++ b/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java @@ -26,22 +26,8 @@ import org.junit.Test; public class LauncherTestCase { @Test - public void testContributionBindingSCACalculator() throws Exception { - SampleJSELauncher.main(new String[] {"contribution-binding-sca-calculator"}); + public void testContributionImplementationJavaCalculatorAsync() throws Exception { + SampleJSELauncher.main(null); } - - @Test - public void testContributionBindingWSCalculator() throws Exception { - SampleJSELauncher.main(new String[] {"contribution-binding-ws-calculator"}); - } - - @Test - public void testContributionBindingRMICalculator() throws Exception { - SampleJSELauncher.main(new String[] {"contribution-binding-rmi-calculator"}); - } - - @Test - public void testContributionImplementationJavaCalculator() throws Exception { - SampleJSELauncher.main(new String[] {"contribution-implementation-java-calculator"}); - } + } diff --git a/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite index 8da74bfc49..867b0e6c33 100644 --- a/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite +++ b/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite @@ -24,7 +24,6 @@ - -- cgit v1.2.3