Remove unused client and add default files to bean

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

2 files changed, 2 insertions, 52 deletions

diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
index bb39e961b4..71724ee7ae 100644
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
+++ b/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/AddBean.java
@@ -20,6 +20,8 @@
 package calculator;

 

 public class AddBean {

+    private static final String DEFAULT_S = "default string";

+    private static final Boolean DEFAULT_B = false;

 

     protected double n1;

     protected double n2;

diff --git a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 1df1f31c48..0000000000
--- a/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator-webapp/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,52 +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() {

-        // Calculate

-        System.out.println("SCA API ClassLoader: " + 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));

-    }

-

-}