You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2008/05/16 12:30:51 UTC
svn commit: r657008 - in /incubator/tuscany/sandbox/mobile-android:
calculator-android/src/ calculator-android/src/calculator/
calculator-android/src/calculator/android/ contribution-impl/
Author: adrianocrestani
Date: Fri May 16 03:30:50 2008
New Revision: 657008
URL: http://svn.apache.org/viewvc?rev=657008&view=rev
Log:
-adding again the calculator-android src
-added Android library to contribution-impl eclipse project
Added:
incubator/tuscany/sandbox/mobile-android/calculator-android/src/
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddService.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddServiceImpl.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorService.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorServiceImpl.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideService.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideServiceImpl.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyService.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyServiceImpl.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractService.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractServiceImpl.java
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/
incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/CalculatorClient.java
Modified:
incubator/tuscany/sandbox/mobile-android/contribution-impl/.classpath
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddService.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddService.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddService.java Fri May 16 03:30:50 2008
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * The Add service interface
+ */
+public interface AddService {
+
+ double add(double n1, double n2);
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddServiceImpl.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddServiceImpl.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/AddServiceImpl.java Fri May 16 03:30:50 2008
@@ -0,0 +1,35 @@
+/*
+ * 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 java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Add service
+ */
+public class AddServiceImpl implements AddService {
+
+ public double add(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
+ return n1 + n2;
+ }
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorService.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorService.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorService.java Fri May 16 03:30:50 2008
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+
+/**
+ * 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);
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorServiceImpl.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorServiceImpl.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/CalculatorServiceImpl.java Fri May 16 03:30:50 2008
@@ -0,0 +1,70 @@
+/*
+ * 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.osoa.sca.annotations.Reference;
+
+
+/**
+ * An implementation of the Calculator service.
+ */
+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) {
+ return multiplyService.multiply(n1, n2);
+ }
+
+ public double divide(double n1, double n2) {
+ return divideService.divide(n1, n2);
+ }
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideService.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideService.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideService.java Fri May 16 03:30:50 2008
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * The divide service interface
+ */
+public interface DivideService {
+
+ double divide(double n1, double n2);
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideServiceImpl.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideServiceImpl.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/DivideServiceImpl.java Fri May 16 03:30:50 2008
@@ -0,0 +1,35 @@
+/*
+ * 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 java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Divide service.
+ */
+public class DivideServiceImpl implements DivideService {
+
+ public double divide(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
+ return n1 / n2;
+ }
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyService.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyService.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyService.java Fri May 16 03:30:50 2008
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * The interface for the multiply service
+ */
+public interface MultiplyService {
+
+ double multiply(double n1, double n2);
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyServiceImpl.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyServiceImpl.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/MultiplyServiceImpl.java Fri May 16 03:30:50 2008
@@ -0,0 +1,35 @@
+/*
+ * 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 java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Multiply service.
+ */
+public class MultiplyServiceImpl implements MultiplyService {
+
+ public double multiply(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
+ return n1 * n2;
+ }
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractService.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractService.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractService.java Fri May 16 03:30:50 2008
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * The interface for the multiply service
+ */
+public interface SubtractService {
+
+ double subtract(double n1, double n2);
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractServiceImpl.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractServiceImpl.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/SubtractServiceImpl.java Fri May 16 03:30:50 2008
@@ -0,0 +1,35 @@
+/*
+ * 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 java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the subtract service.
+ */
+public class SubtractServiceImpl implements SubtractService {
+
+ public double subtract(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
+ return n1 - n2;
+ }
+
+}
Added: incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/CalculatorClient.java?rev=657008&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/CalculatorClient.java (added)
+++ incubator/tuscany/sandbox/mobile-android/calculator-android/src/calculator/android/CalculatorClient.java Fri May 16 03:30:50 2008
@@ -0,0 +1,36 @@
+package calculator.android;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import calculator.CalculatorService;
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class CalculatorClient extends Activity {
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ StringBuffer sb = new StringBuffer();
+
+ SCADomain scaDomain = SCADomain.newInstance(this, "dex://calculator.android/raw/calculator.composite");
+
+ CalculatorService calculatorService =
+ scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+
+ // Calculate
+ sb.append("3 + 2=" + calculatorService.add(3, 2));
+ sb.append("3 - 2=" + calculatorService.subtract(3, 2));
+ sb.append("3 * 2=" + calculatorService.multiply(3, 2));
+ sb.append("3 / 2=" + calculatorService.divide(3, 2));
+
+ scaDomain.close();
+
+ TextView tv = new TextView(this);
+ tv.setText(sb.toString());
+ setContentView(tv);
+
+ }
+}
\ No newline at end of file
Modified: incubator/tuscany/sandbox/mobile-android/contribution-impl/.classpath
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/contribution-impl/.classpath?rev=657008&r1=657007&r2=657008&view=diff
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/contribution-impl/.classpath (original)
+++ incubator/tuscany/sandbox/mobile-android/contribution-impl/.classpath Fri May 16 03:30:50 2008
@@ -5,6 +5,7 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.2/junit-4.2.jar"/>
<classpathentry kind="src" path="/tuscany-contribution"/>
<classpathentry kind="src" path="/tuscany-assembly"/>
@@ -22,6 +23,6 @@
<classpathentry kind="src" path="/tuscany-contribution-resource"/>
<classpathentry kind="src" path="/tuscany-contribution-xml"/>
<classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/JavaClasses"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/android-jdk-classes"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>