You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/10 11:57:01 UTC
svn commit: r527074 - in /incubator/tuscany/java/sca: ./ samples/
samples/calculator/ samples/calculator/src/main/java/calculator/
samples/calculator/src/test/java/calculator/
Author: jsdelfino
Date: Tue Apr 10 02:57:00 2007
New Revision: 527074
URL: http://svn.apache.org/viewvc?view=rev&rev=527074
Log:
Ported the Calculator sample to the latest APIs. Adjusted its pom to the new modules.
Added:
incubator/tuscany/java/sca/samples/pom.xml (with props)
Modified:
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/samples/calculator/pom.xml
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/AddServiceImpl.java
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
incubator/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Tue Apr 10 02:57:00 2007
@@ -42,8 +42,8 @@
<module>../pom/parent</module>
<module>../buildtools</module>
<module>modules</module>
- <!--
<module>samples</module>
+ <!--
<module>itest</module>
-->
</modules>
Modified: incubator/tuscany/java/sca/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/pom.xml?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator/pom.xml Tue Apr 10 02:57:00 2007
@@ -18,38 +18,36 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>parent</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sample-calculator</artifactId>
- <packaging>jar</packaging>
<name>Apache Tuscany Calculator Sample</name>
- <description>A sample Calculator made of several SCA components wired together.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-core</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
+
</dependencies>
<build>
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/AddServiceImpl.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/AddServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/AddServiceImpl.java Tue Apr 10 02:57:00 2007
@@ -18,14 +18,9 @@
*/
package calculator;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
-
/**
* An implementation of the Add service
*/
-@Scope("COMPOSITE")
-@EagerInit
public class AddServiceImpl implements AddService {
public double add(double n1, double n2) {
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorClient.java Tue Apr 10 02:57:00 2007
@@ -16,31 +16,32 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package calculator;
import org.apache.tuscany.api.SCARuntime;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the Calculator service and invoke it.
+ * @version $Rev$ $Date$
*/
public class CalculatorClient {
public static void main(String[] args) throws Exception {
-
- SCARuntime.start("Calculator.composite");
- CompositeContext context = CurrentCompositeContext.getContext();
- CalculatorService calculatorService =
- context.locateService(CalculatorService.class, "CalculatorServiceComponent");
+ SCARuntime.start("Calculator.composite");
+ ComponentContext context = SCARuntime.getComponentContext("CalculatorServiceComponent");
+ ServiceReference<CalculatorService> service = context.createSelfReference(CalculatorService.class);
+ CalculatorService calculatorService = service.getService();
// Calculate
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));
-
+
SCARuntime.stop();
+
}
+
}
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java Tue Apr 10 02:57:00 2007
@@ -19,13 +19,11 @@
package calculator;
import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
/**
* An implementation of the Calculator service.
*/
-@Scope("COMPOSITE")
public class CalculatorServiceImpl implements CalculatorService {
private AddService addService;
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/DivideServiceImpl.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/DivideServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/DivideServiceImpl.java Tue Apr 10 02:57:00 2007
@@ -18,12 +18,9 @@
*/
package calculator;
-import org.osoa.sca.annotations.Scope;
-
/**
* An implementation of the Divide service.
*/
-@Scope("COMPOSITE")
public class DivideServiceImpl implements DivideService {
public double divide(double n1, double n2) {
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java Tue Apr 10 02:57:00 2007
@@ -18,12 +18,9 @@
*/
package calculator;
-import org.osoa.sca.annotations.Scope;
-
/**
* An implementation of the Multiply service.
*/
-@Scope("COMPOSITE")
public class MultiplyServiceImpl implements MultiplyService {
public double multiply(double n1, double n2) {
Modified: incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java Tue Apr 10 02:57:00 2007
@@ -18,12 +18,9 @@
*/
package calculator;
-import org.osoa.sca.annotations.Scope;
-
/**
* An implementation of the subtract service.
*/
-@Scope("COMPOSITE")
public class SubtractServiceImpl implements SubtractService {
public double subtract(double n1, double n2) {
Modified: incubator/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=527074&r1=527073&r2=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/calculator/src/test/java/calculator/CalculatorTestCase.java Tue Apr 10 02:57:00 2007
@@ -21,8 +21,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.api.SCARuntime;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.ServiceReference;
/**
* This shows how to test the Calculator service component.
@@ -32,10 +32,10 @@
private CalculatorService calculatorService;
protected void setUp() throws Exception {
- SCARuntime.start("Calculator.composite");
-
- CompositeContext context = CurrentCompositeContext.getContext();
- calculatorService = context.locateService(CalculatorService.class, "CalculatorServiceComponent");
+ SCARuntime.start("Calculator.composite");
+ ComponentContext context = SCARuntime.getComponentContext("CalculatorServiceComponent");
+ ServiceReference<CalculatorService> service = context.createSelfReference(CalculatorService.class);
+ calculatorService = service.getService();
}
protected void tearDown() throws Exception {
Added: incubator/tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?view=auto&rev=527074
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (added)
+++ incubator/tuscany/java/sca/samples/pom.xml Tue Apr 10 02:57:00 2007
@@ -0,0 +1,61 @@
+<?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>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-samples</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Samples</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>calculator</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/tuscany/java/sca/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/samples/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Re: Working sample with the new modularized runtime, was: svn commit: r527074
Posted by Luciano Resende <lu...@gmail.com>.
Revision #527359 have the implementation-crud as a sample application now.
I'm working on getting echo-binding and echo-databinding updated and working
as well.
On 4/10/07, Jean-Sebastien Delfino <js...@apache.org> wrote:
>
> jsdelfino@apache.org wrote:
> > Author: jsdelfino
> > Date: Tue Apr 10 02:57:00 2007
> > New Revision: 527074
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=527074
> > Log:
> > Ported the Calculator sample to the latest APIs. Adjusted its pom to the
> new modules.
> >
> >
>
> The Calculator sample is now working with the new modularized runtime.
>
> More work is needed to finish the migration of the Java component
> implementation support to the new modularized kernel, but at least the
> Calculator sample works and most of the unit tests pass, so we can
> probably start to try the other samples and integration tests.
>
> --
> Jean-Sebastien
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-dev-help@ws.apache.org
>
>
--
Luciano Resende
http://people.apache.org/~lresende
Working sample with the new modularized runtime, was: svn commit:
r527074
Posted by Jean-Sebastien Delfino <js...@apache.org>.
jsdelfino@apache.org wrote:
> Author: jsdelfino
> Date: Tue Apr 10 02:57:00 2007
> New Revision: 527074
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=527074
> Log:
> Ported the Calculator sample to the latest APIs. Adjusted its pom to the new modules.
>
>
The Calculator sample is now working with the new modularized runtime.
More work is needed to finish the migration of the Java component
implementation support to the new modularized kernel, but at least the
Calculator sample works and most of the unit tests pass, so we can
probably start to try the other samples and integration tests.
--
Jean-Sebastien
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org