Rename 2.0-M5.1 release tag

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

8 files changed, 0 insertions, 535 deletions

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/README b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/README
deleted file mode 100644
index 359e5d134d..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/README
+++ /dev/null
@@ -1,20 +0,0 @@
-JSE Sample Launcher

-===================

-

-This directory contains a sample java launcher for the

-tuscany sample contributions. sample contributions.  

-

-The README file in the <distribution-unpack-dir>/samples directory provides 

-general instructions about building and running sample contributions using the

-tuscany sample launchers ( where distribution-unpack-dir is the directory in which you

-unpacked the tuscany binary distribution archive)

-

-To use this sample JSE launcher with ant excute the command

-

-ant run-<contributionname>

-

-where run-<contributionname> is one of the targets in the build.xml file

-

-To use this sample launcher to run all of the contributions as junit test cases,

-execute the command "mvn" in the launcher directory.

-

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/build.xml
deleted file mode 100644
index 89987056d2..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/build.xml
+++ /dev/null
@@ -1,119 +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.    

--->

-<project name="launcher-embedded-jse" default="run"> 

-	<property name="tuscany.home" value="../.."/>

-    <property name="jar.name"   value="sample-launcher-embedded-jse.jar" />

-    <property name="main.class" value="launcher.SampleJSELauncher" />

-	<property name="wait.before.stopping" value="dontWaitBeforeStopping" />

-	

-	<echo>${tuscany.home}</echo>

-

-    <target name="init"> 

-      <delete quiet="true" includeemptydirs="true"> 

-         <fileset dir="target"/> 

-      </delete> 

-      <mkdir dir="target/classes"/> 

-    </target>

-	

-    <target name="compile" depends="init">

-      <javac srcdir="src/main/java" 

-      	     destdir="target/classes" 

-      	     debug="on"

-             source="1.5"

-             target="1.5"

-      	     failonerror="true"> 

-         <classpath>

-            <fileset dir="${tuscany.home}/lib">

-               <include name="tuscany-base-*.jar" />

-            </fileset>

-         </classpath>

-      </javac> 

-      <jar destfile="target/${jar.name}" basedir="target/classes"> 

-         <manifest>

-            <attribute name="Main-Class" value="${main.class}" /> 

-         </manifest>

-      </jar>    	

-    </target>

-	

-	<target name="run" depends="compile">

-		<echo>Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of</echo>

-	    <echo>  'ant run-contribution-binding-sca-calculator' </echo>

-	    <echo>  'ant run-contribution-binding-ws-calculator'  </echo>

-		<echo>  'ant run-contribution-binding-rmi-calculator'  </echo>

-	    <echo>  'ant run-contribution-implementation-java-calculator'  </echo>

-    </target>

-

-    <target name="run-contribution-binding-sca-calculator" depends="compile">

-        <java classname="${main.class}"

-              fork="true"

-        	  failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features">

-                   <include name="tuscany-sca-manifest.jar" />

-                </fileset>

-            </classpath> 

-        	<arg value="contribution-binding-sca-calculator"/> 

-            <arg value="${wait.before.stopping}"/> 

-        </java>    	

-    </target>

-	

-    <target name="run-contribution-binding-ws-calculator" depends="compile">

-        <java classname="${main.class}"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features">

-                   <include name="tuscany-sca-manifest.jar" />

-                </fileset>

-            </classpath> 

-            <arg value="contribution-binding-ws-calculator"/> 

-        </java>     

-    </target>	

-	

-    <target name="run-contribution-binding-rmi-calculator" depends="compile">

-        <java classname="${main.class}"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features">

-                   <include name="tuscany-sca-manifest.jar" />

-                </fileset>

-            </classpath> 

-            <arg value="contribution-binding-rmi-calculator"/> 

-        </java>     

-    </target>	

-	

-    <target name="run-contribution-implementation-java-calculator" depends="compile">

-        <java classname="${main.class}"

-              fork="true"

-              failonerror="true">

-            <classpath>  

-                <pathelement location="target/${jar.name}"/>

-                <fileset dir="${tuscany.home}/features">

-                   <include name="tuscany-sca-manifest.jar" />

-                </fileset>

-            </classpath> 

-            <arg value="contribution-implementaton-java-calculator"/> 

-        </java>     

-    </target>	

-

-</project>

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/pom.xml
deleted file mode 100644
index 16274169d8..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/pom.xml
+++ /dev/null
@@ -1,76 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M5.1</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-launcher-embedded-jse</artifactId>
-    <name>Apache Tuscany SCA Sample Launcher Embedded JSE</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-api</artifactId>
-            <type>pom</type>
-            <version>2.0-M5.1</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-core</artifactId>
-            <type>pom</type>
-            <version>2.0-M5.1</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-webservice</artifactId>
-            <type>pom</type>
-            <version>2.0-M5.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-ejava</artifactId>
-            <type>pom</type>
-            <version>2.0-M5.1</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-
-       <plugins>
-         
-       </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 12d80ffd1c..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,38 +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.Remotable;

-

-

-/**

- * The Calculator service interface.

- */

-@Remotable

-public interface CalculatorService {

-

-    double add(double n1, double n2);

-

-    double subtract(double n1, double n2);

-

-    double multiply(double n1, double n2);

-

-    double divide(double n1, double n2);

-

-}

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
deleted file mode 100644
index fdff16c12c..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
+++ /dev/null
@@ -1,43 +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 launcher;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-

-/**

- * Base JSE launcher function

- */

-public class RuntimeIntegration {

-    

-    

-    public Node startNode(Contribution... contributions){

-        Node node = NodeFactory.newInstance().createNode(contributions);

-        node.start();

-        return node;

-    }

-    

-    public void stopNode(Node node){

-        node.stop();

-    }

-    

-}

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
deleted file mode 100644
index 9a4a73c556..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
+++ /dev/null
@@ -1,150 +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 launcher;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-

-import calculator.CalculatorService;

-

-

-/**

- * This client program shows how to create an embedded SCA runtime, load a contribution,

- * start it and, in some cases, locate and invoke an SCA component 

- */

-public class SampleJSELauncher extends RuntimeIntegration {

-    

-    protected boolean waitBeforeStopping = false;

-    

-    public static void main(String[] args) throws Exception {

-        

-        // get the contribution name from the 1st argument it there is one

-        String contribution = null;

-        

-        if (args == null || args.length != 1){

-            System.out.println("Please provide the name of the sample contribution to run as a parameter");

-            System.out.println("Running binding-sca-calculator by default");

-            contribution = "contribution-binding-sca-calculator";

-        } else {

-            contribution = args[0];

-        }   

-        

-        // assume that more than one argument means that the caller wants to

-        // keep the SCA application running while other clients use the services

-        boolean waitBeforeStopping = false;

-        

-        if (args != null && args.length > 1 && args[1].equals("waitBeforeStopping")){

-            waitBeforeStopping = true;

-        }

-        

-        SampleJSELauncher launcher = new SampleJSELauncher(waitBeforeStopping);

-        

-        if (contribution.equals("contribution-binding-sca-calculator")){

-            launcher.launchBindingSCACalculator();

-        } else if (contribution.equals("contribution-binding-ws-calculator")){

-            launcher.launchBindingWSCalculator();

-        } else if (contribution.equals("contribution-binding-rmi-calculator")){

-            launcher.launchBindingRMICalculator();    

-        } else if (contribution.equals("contribution-implementation-java-calculator")){

-            launcher.launchImplementationJavaCalculator();              

-        } else {

-            System.out.println("Sample contribution " + contribution + "not found");

-        }

-               

-    }

-    

-    public SampleJSELauncher(boolean waitBeforeStopping){

-        this.waitBeforeStopping = waitBeforeStopping;

-    }

-    

-    /**

-     * Wait for user input. Allows us to keep the Tuscany runtime and the SCA application

-     * running while other clients access the services provided 

-     */

-    public void waitBeforeStopping(){

-        if (waitBeforeStopping){

-            try {

-                System.out.println("Press key to continue");

-                int input = System.in.read();

-            } catch (Exception ex) {

-                // do nothing

-            }

-        }

-    }

-       

-    /**

-     * 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", "../binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));

-        waitBeforeStopping();

-        stopNode(node);

-    }    

-    

-    /*

-     * Using a Tuscany specific mechanism for getting at local service proxies

-     */

-    public void launchBindingWSCalculator(){

-        Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/classes"));

-        

-        CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");

-        // TODO - could use JUnit assertions but don't want to have to handle JUnit dependency from Ant script

-        double result = calculator.add(3, 2);

-        System.out.println("3 + 2 = " + result);

-        if (result != 5.0){

-            throw new SampleLauncherException();

-        }

-        

-        waitBeforeStopping();

-        stopNode(node);

-    }

-    

-    /*

-     * Using a Tuscany specific mechanism for getting at local service proxies

-     */

-    public void launchBindingRMICalculator(){

-        Node node1 = startNode(new Contribution("c1", "../binding-rmi/contribution-calculator-service/target/classes"));

-        Node node2 = startNode(new Contribution("c1", "../binding-rmi/contribution-calculator-reference/target/classes"));

-        

-        CalculatorService calculator = node2.getService(CalculatorService.class, "CalculatorServiceComponent");

-        // TODO - could use JUnit assertions but don't want to have to handle JUnit dependency from Ant script

-        double result = calculator.add(3, 2);

-        System.out.println("3 + 2 = " + result);

-        if (result != 5.0){

-            throw new SampleLauncherException();

-        }

-        

-        waitBeforeStopping();

-        stopNode(node2);

-        stopNode(node1);

-    }   

-    

-    /**

-     * The contribution-binding-sca-calculator contribution includes a client component 

-     * that calls the CalculatorServiceComponent from an operation marked by @Init. 

-     */

-    public void launchImplementationJavaCalculator(){

-        Node node = startNode(new Contribution("c1", "../contribution-implementation-java-calculator/target/classes"));

-        waitBeforeStopping();

-        stopNode(node);

-    }      

-    

-}

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
deleted file mode 100644
index f2ed3d421d..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
+++ /dev/null
@@ -1,42 +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 launcher;

-

-/**

- * This exception signals problems in the management of SCA component execution.

- */

-public class SampleLauncherException extends RuntimeException {

-    /**

-     * Constructs a SampleLauncherException with no detail message. 

-     */

-    public SampleLauncherException() {

-        super();

-    }

-

-    /**

-     * Constructs a SampleLauncherException with the specified detail

-     * message. 

-     *

-     * @param     message the detail message

-     */

-    public SampleLauncherException(String message) {

-        super(message);

-    }

-

-}

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
deleted file mode 100644
index 3c2acbcc46..0000000000
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
+++ /dev/null
@@ -1,47 +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 launcher;

-

-import org.junit.Test;

-

-/**

- * Test sample contributions.

- */

-public class LauncherTestCase {

-

-    @Test

-    public void testContributionBindingSCACalculator() throws Exception {

-        SampleJSELauncher.main(new String[] {"contribution-binding-sca-calculator"});

-    }

-    

-    @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"});

-    }     

-}