From 8ee4667047f8c52062193092499df0969498931a Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 4 Feb 2009 11:51:39 +0000 Subject: Change binding-ws-calculator/build.xml to look similar to the way our build files used to look. Relies on launcher.jar to run the sample. Add itest/sample to run the samples automatically. Error handling not working yet. This also relies on distribution/all generating a dir distro to test against. Currently this runs as part of the main build but I see Raymond has now separated distributions from features so we could have this be a distribution test stage. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@740702 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/distribution/all/pom.xml | 20 ++++++ java/sca/itest/pom.xml | 1 + java/sca/itest/samples/build.xml | 38 ++++++++++ java/sca/itest/samples/pom.xml | 80 ++++++++++++++++++++++ java/sca/samples/binding-ws-calculator/build.xml | 55 ++++++++++++--- java/sca/samples/binding-ws-calculator/pom.xml | 8 ++- .../src/main/java/calculator/CalculatorClient.java | 73 -------------------- .../src/main/resources/Calculator.composite | 10 +-- .../test/java/calculator/CalculatorTestCase.java | 41 ++--------- java/sca/samples/build-common.xml | 3 + 10 files changed, 203 insertions(+), 126 deletions(-) create mode 100644 java/sca/itest/samples/build.xml create mode 100644 java/sca/itest/samples/pom.xml delete mode 100644 java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java (limited to 'java') diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml index 70e033d263..f5c7478f12 100644 --- a/java/sca/distribution/all/pom.xml +++ b/java/sca/distribution/all/pom.xml @@ -60,6 +60,26 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + distribution-package + package + + single + + + + src/main/assembly/dir.xml + + gnu + apache-tuscany-sca-all-2.0-SNAPSHOT + + + + diff --git a/java/sca/itest/pom.xml b/java/sca/itest/pom.xml index 6fdc8fd0d9..3f6490dd6f 100644 --- a/java/sca/itest/pom.xml +++ b/java/sca/itest/pom.xml @@ -69,6 +69,7 @@ --> recursive-multi-level references + samples scopes services wires diff --git a/java/sca/itest/samples/build.xml b/java/sca/itest/samples/build.xml new file mode 100644 index 0000000000..9650b5e56f --- /dev/null +++ b/java/sca/itest/samples/build.xml @@ -0,0 +1,38 @@ + + + + ${JAVA_HOME} + + + + + + + + diff --git a/java/sca/itest/samples/pom.xml b/java/sca/itest/samples/pom.xml new file mode 100644 index 0000000000..e43ddea0a9 --- /dev/null +++ b/java/sca/itest/samples/pom.xml @@ -0,0 +1,80 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + ../pom.xml + + itest-samples + Apache Tuscany SCA Samples Integration Tests + + + + org.apache.tuscany.sca + tuscany-distribution-all + pom + 2.0-SNAPSHOT + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + + ant + ant-trax + 1.6.5 + + + + sun.jdk + tools + 1.6 + system + ${java.home}/../lib/tools.jar + + + + + + run-samples + validate + + run + + + + + + + + + + + + diff --git a/java/sca/samples/binding-ws-calculator/build.xml b/java/sca/samples/binding-ws-calculator/build.xml index 67a7818fc1..be237938fd 100644 --- a/java/sca/samples/binding-ws-calculator/build.xml +++ b/java/sca/samples/binding-ws-calculator/build.xml @@ -17,17 +17,52 @@ * under the License. --> - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/sca/samples/binding-ws-calculator/pom.xml b/java/sca/samples/binding-ws-calculator/pom.xml index 6f184b87c2..eec6d5da17 100644 --- a/java/sca/samples/binding-ws-calculator/pom.xml +++ b/java/sca/samples/binding-ws-calculator/pom.xml @@ -57,6 +57,13 @@ 2.0-SNAPSHOT + + org.apache.tuscany.sca + tuscany-distribution-ejava + pom + 2.0-SNAPSHOT + + junit junit @@ -70,7 +77,6 @@ ${artifactId} - org.apache.maven.plugins maven-surefire-plugin diff --git a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java b/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 0f275ea46e..0000000000 --- a/java/sca/samples/binding-ws-calculator/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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. - */ - -package calculator; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -@Scope("COMPOSITE") @EagerInit -public class CalculatorClient { - - private CalculatorService calculatorService; - - @Reference - public void setCalculatorService(CalculatorService calculatorService) { - this.calculatorService = calculatorService; - } - - @Init - public void calculate() { - // The calls cannot be done in the same thread as the services are starting - // Fork a new thread - Thread thread = new Thread() { - public void run() { - // Calculate - try { - Thread.sleep(3000); - System.out.println("SCA API ClassLoader: " + print(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)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - } catch (Throwable e) { - e.printStackTrace(); - } - } - }; - thread.start(); - } - - private static String print(ClassLoader cl) { - StringBuffer buf = new StringBuffer(); - for (; cl != null;) { - buf.append(cl.toString()); - buf.append(' '); - cl = cl.getParent(); - } - return buf.toString(); - } - -} diff --git a/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite b/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite index d27d09cb8e..f4bcaf4352 100644 --- a/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite +++ b/java/sca/samples/binding-ws-calculator/src/main/resources/Calculator.composite @@ -22,6 +22,11 @@ xmlns:sample="http://sample" name="Calculator"> + + + + + @@ -51,9 +56,4 @@ - - - - - diff --git a/java/sca/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/java/sca/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java index 2e710ee4ae..bc90f0e566 100644 --- a/java/sca/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java +++ b/java/sca/samples/binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java @@ -27,48 +27,15 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import sample.SampleClientImpl; + /** - * This shows how to test the Calculator composition. + * Test the Calculator composition. */ public class CalculatorTestCase { - private static NodeLauncher launcher; - private static Node node; - private static String status = "Sample Success"; - - public static void main(String[] args) throws Exception { - setUpBeforeClass(); - tearDownAfterClass(); - } - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - launcher = NodeLauncher.newInstance(); - String location = ContributionLocationHelper.getContributionLocation(CalculatorClient.class); - node = launcher.createNode("Calculator.composite", new Contribution("test", location)); - - try { - node.start(); - } catch (Exception ex) { - status = ex.toString(); - System.out.println(status); - } - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - Thread.sleep(30000); - if (node != null) { - node.stop(); - node.destroy(); - } - if (launcher != null) { - launcher.destroy(); - } - } - @Test public void testSample() throws Exception { - Assert.assertEquals("Sample Success", status); + SampleClientImpl.main(null); } } diff --git a/java/sca/samples/build-common.xml b/java/sca/samples/build-common.xml index 9c81fc929d..2354dd1ce4 100644 --- a/java/sca/samples/build-common.xml +++ b/java/sca/samples/build-common.xml @@ -31,6 +31,9 @@ + + + -- cgit v1.2.3