Moving 1.x trunk

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

14 files changed, 0 insertions, 477 deletions

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
deleted file mode 100644
index ecaa4e28de..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
deleted file mode 100644
index 66a0ba0e63..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
+++ /dev/null
@@ -1,34 +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 bigbank.calculator;

-

-/**

- * The Calculator service interface.

- */

-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/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 2a529dddeb..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,72 +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 bigbank.calculator;

-

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Service;

-

-/**

- * An implementation of the Calculator service.

- */

-@Service(CalculatorService.class)

-public class CalculatorServiceImpl implements CalculatorService {

-

-    private AddService addService;

-    private SubtractService subtractService;

-    private MultiplyService multiplyService;

-    private DivideService divideService;

-

-    @Reference

-    public void setAddService(AddService addService) {

-        this.addService = addService;

-    }

-

-    @Reference

-    public void setSubtractService(SubtractService subtractService) {

-        this.subtractService = subtractService;

-    }

-

-    @Reference

-    public void setDivideService(DivideService divideService) {

-        this.divideService = divideService;

-    }

-

-    @Reference

-    public void setMultiplyService(MultiplyService multiplyService) {

-        this.multiplyService = multiplyService;

-    }

-

-    public double add(double n1, double n2) {

-        return addService.add(n1, n2);

-    }

-

-    public double subtract(double n1, double n2) {

-        return subtractService.subtract(n1, n2);

-    }

-

-    public double multiply(double n1, double n2) {

-        System.err.println("Multiply");

-        return multiplyService.multiply(n1, n2);

-    }

-

-    public double divide(double n1, double n2) {

-        return divideService.divide(n1, n2);

-    }

-

-}

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
deleted file mode 100644
index 22e9d58a94..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface DivideService {

-

-    double divide(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
deleted file mode 100644
index ba3d43448e..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface MultiplyService {

-

-    double multiply(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
deleted file mode 100644
index 17691af0e8..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
+++ /dev/null
@@ -1,25 +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 bigbank.calculator;

-

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
deleted file mode 100644
index c6a230fcb4..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
+++ /dev/null
@@ -1,50 +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 bigbank.calculator.server;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-public class CalculatorServer {
-
-    public static void main(String[] args) throws Exception {
-        long timeout = -1L;
-        if (args.length > 0) {
-            timeout = Long.parseLong(args[0]);
-        }
-
-        System.out.println("Starting the Sample SCA Calculator...");
-
-        SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
-        node.start();
-
-        if (timeout < 0) {
-            System.out.println("Press Enter to Exit...");
-            System.in.read();
-        } else {
-            Thread.sleep(timeout);
-        }
-
-        node.stop();
-        System.out.println("Bye");
-    }
-
-}
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 504a4ccfcd..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,56 +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"

-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://calc"

-	xmlns:c="http://calc"

-	name="Calculator">

-	

-	<service name="CalculatorService" promote="CalculatorServiceComponent">

-	    <interface.java interface="bigbank.calculator.CalculatorService"/>

-        <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>

-    </service>

-

-    <component name="CalculatorServiceComponent">

-		<implementation.spring location="META-INF/spring/CalculatorService-context.xml"/> 

-

-        <reference name="addService" target="AddServiceComponent" />

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent" />

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>

-

-    <component name="AddServiceComponent">

-        <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>

-    </component>

-

-    <component name="SubtractServiceComponent">

-        <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>

-    </component>

-

-    <component name="MultiplyServiceComponent">

-        <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>

-    </component>

-

-    <component name="DivideServiceComponent">

-        <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
deleted file mode 100644
index 42e5f824f9..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
+++ /dev/null
@@ -1,45 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <sca:service name="CalculatorService"
-        type="bigbank.calculator.CalculatorService" target="CalculatorServiceBean"/>
-
-    <bean id="CalculatorServiceBean" class="bigbank.calculator.CalculatorServiceImpl">
-        <!-- Here are some implicit references - a property with a ref not satisifed within the
-         * Spring application context.
-         -->
-        <property name="addService" ref="addService"/>
-        <property name="subtractService" ref="subtractService"/>
-        <property name="multiplyService" ref="multiplyService"/>
-        <property name="divideService" ref="divideService"/>
-    </bean>
-
-    <sca:reference name="addService" type="bigbank.calculator.AddService"/>    
-    <sca:reference name="subtractService" type="bigbank.calculator.SubtractService"/>    
-    <sca:reference name="multiplyService" type="bigbank.calculator.MultiplyService"/>    
-    <sca:reference name="divideService" type="bigbank.calculator.DivideService"/>
-
-</beans>
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 6f11106ddd..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
+++ /dev/null
@@ -1,22 +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.    

- */

-

-function add(n1, n2) {

-   return n1 + n2;

-}
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
+++ /dev/null
@@ -1,22 +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.    

- */

- 

-def divide(n1, n2) {

-   return n1 / n2

-}
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index cfd96f287a..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
+++ /dev/null
@@ -1,21 +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.

-#

- 

-def multiply(n1, n2):

-   print "Python Calculator component: multiply(", n1, ",", n2, ")"

-   return n1 * n2
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 8e7a884d41..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
+++ /dev/null
@@ -1,22 +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.

-#

- 

-def subtract(n1, n2)

-    print "Ruby Calculator subtract(", n1, ",", n2, ")\n"

-    return n1 - n2

-end
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java b/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
deleted file mode 100644
index 02a11485cd..0000000000
--- a/branches/sca-java-1.x/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
+++ /dev/null
@@ -1,33 +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 bigbank.calculator;

-

-import junit.framework.TestCase;

-import bigbank.calculator.server.CalculatorServer;

-

-/**

- * Tests out the big bank service

- *

- */

-public class CalculatorServiceTestCase extends TestCase {

-

-    public void testServer() throws Exception {

-        CalculatorServer.main(new String[] {"1000"});

-    }

-}