Author: slaws
Date: Tue Jul 13 10:20:40 2010
New Revision: 963660
URL: http://svn.apache.org/viewvc?rev=963660&view=rev
Log:
Changes to get the test running in my environment
Removed:
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/Calculate.java
Modified:
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
tuscany/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
Modified:
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java?rev=963660&r1=963659&r2=963660&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
(original)
+++
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/calculator/CalculatorService.java
Tue Jul 13 10:20:40 2010
@@ -27,6 +27,5 @@ import org.oasisopen.sca.annotation.Remo
@Remotable
public interface CalculatorService {
- String factors(Integer i);
-
+ String calculate(Integer n1);
}
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java?rev=963660&r1=963659&r2=963660&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
(original)
+++
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/main/java/launcher/SampleJSELauncher.java
Tue Jul 13 10:20:40 2010
@@ -48,7 +48,7 @@ public class SampleJSELauncher extends R
SampleJSELauncher launcher = new SampleJSELauncher(waitBeforeStopping);
- launcher.launchBindingSCACalculator();
+ launcher.launchImplementationJavaCalculatorAsync();
}
@@ -75,8 +75,8 @@ public class SampleJSELauncher extends R
* 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);
}
Modified:
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java?rev=963660&r1=963659&r2=963660&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/contrib/samples/async/embedded-jse-async-sample-launcher/src/test/java/launcher/LauncherTestCase.java
Tue Jul 13 10:20:40 2010
@@ -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"});
- }
+
}
Modified:
tuscany/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite?rev=963660&r1=963659&r2=963660&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
(original)
+++
tuscany/sca-java-2.x/trunk/contrib/samples/async/sample-contribution-implementation-java-calculator-async/src/main/resources/Calculator.composite
Tue Jul 13 10:20:40 2010
@@ -24,7 +24,6 @@
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="calcService"
interface.java="CalculateViaAsyncRef.java" />
</component>
</composite>
